author | Bill McCloskey <billm@mozilla.com> |
Tue, 28 Apr 2015 16:34:00 -0700 | |
changeset 241714 | d10105a7583573b5e212521c9fbcb3e680804285 |
parent 241713 | 628c47a140bb23d0951cf2bd6a876b52302d1555 |
child 241715 | b75eb0486721e868c0a27a9aa51a82038678a179 |
push id | 28669 |
push user | ryanvm@gmail.com |
push date | Thu, 30 Apr 2015 17:57:05 +0000 |
treeherder | mozilla-central@7723b15ea695 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | felipe |
bugs | 1156515 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -23,20 +23,16 @@ key="key_newNavigator" command="cmd_newNavigator"/> <menuitem id="menu_newPrivateWindow" label="&newPrivateWindow.label;" accesskey="&newPrivateWindow.accesskey;" command="Tools:PrivateBrowsing" key="key_privatebrowsing"/> #ifdef E10S_TESTING_ONLY - <menuitem id="menu_newRemoteWindow" - label="New e10s Window" - hidden="true" - command="Tools:RemoteWindow"/> <menuitem id="menu_newNonRemoteWindow" label="New Non-e10s Window" hidden="true" command="Tools:NonRemoteWindow"/> #endif #ifdef MAC_NON_BROWSER_WINDOW <menuitem id="menu_openLocation" label="&openLocationCmd.label;"
--- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -109,18 +109,16 @@ <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/> <command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/> <command id="Tools:DevToolsConnect" oncommand="gDevToolsBrowser.openConnectScreen(gBrowser)" disabled="true" hidden="true"/> <command id="Tools:Sanitize" oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/> <command id="Tools:PrivateBrowsing" oncommand="OpenBrowserWindow({private: true});" reserved="true"/> #ifdef E10S_TESTING_ONLY - <command id="Tools:RemoteWindow" - oncommand="OpenBrowserWindow({remote: true});"/> <command id="Tools:NonRemoteWindow" oncommand="OpenBrowserWindow({remote: false});"/> #endif <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/> <command id="History:UndoCloseWindow" oncommand="undoCloseWindow();"/> <command id="Social:SharePage" oncommand="SocialShare.sharePage();"/> <command id="Social:ToggleSidebar" oncommand="SocialSidebar.toggleSidebar();" hidden="true"/> <command id="Social:ToggleNotifications" oncommand="Social.toggleNotifications();" hidden="true"/>
--- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -7225,20 +7225,18 @@ let gRemoteTabsUI = { #ifdef XP_MACOSX if (Services.prefs.getBoolPref("layers.acceleration.disabled")) { // On OS X, "Disable Hardware Acceleration" also disables OMTC and forces // a fallback to Basic Layers. This is incompatible with e10s. return; } #endif - let newRemoteWindow = document.getElementById("menu_newRemoteWindow"); let newNonRemoteWindow = document.getElementById("menu_newNonRemoteWindow"); let autostart = Services.appinfo.browserTabsRemoteAutostart; - newRemoteWindow.hidden = autostart; newNonRemoteWindow.hidden = !autostart; } }; /** * Switch to a tab that has a given URI, and focusses its browser window. * If a matching tab is in this window, it will be switched to. Otherwise, other * windows will be searched.
--- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -1212,45 +1212,31 @@ if (Services.prefs.getBoolPref("browser. }; CustomizableWidgets.push(pocketButton); CustomizableUI.addListener(pocketButton); } } #ifdef E10S_TESTING_ONLY -/** - * The e10s button's purpose is to lower the barrier of entry - * for our Nightly testers to use e10s windows. We'll be removing it - * once remote tabs are enabled. This button should never ever make it - * to production. If it does, that'd be bad, and we should all feel bad. - */ -let getCommandFunction = function(aOpenRemote) { - return function(aEvent) { - let win = aEvent.view; - if (win && typeof win.OpenBrowserWindow == "function") { - win.OpenBrowserWindow({remote: aOpenRemote}); - } - }; -} - -let openRemote = !Services.appinfo.browserTabsRemoteAutostart; -// Like the XUL menuitem counterparts, we hard-code these strings in because -// this button should never roll into production. -let buttonLabel = openRemote ? "New e10s Window" - : "New Non-e10s Window"; - let e10sDisabled = Services.appinfo.inSafeMode; #ifdef XP_MACOSX // On OS X, "Disable Hardware Acceleration" also disables OMTC and forces // a fallback to Basic Layers. This is incompatible with e10s. e10sDisabled |= Services.prefs.getBoolPref("layers.acceleration.disabled"); #endif -CustomizableWidgets.push({ - id: "e10s-button", - label: buttonLabel, - tooltiptext: buttonLabel, - disabled: e10sDisabled, - defaultArea: CustomizableUI.AREA_PANEL, - onCommand: getCommandFunction(openRemote), -}); +if (Services.appinfo.browserTabsRemoteAutostart) { + CustomizableWidgets.push({ + id: "e10s-button", + label: "New Non-e10s Window", + tooltiptext: "New Non-e10s Window", + disabled: e10sDisabled, + defaultArea: CustomizableUI.AREA_PANEL, + onCommand: function(aEvent) { + let win = aEvent.view; + if (win && typeof win.OpenBrowserWindow == "function") { + win.OpenBrowserWindow({remote: false}); + } + }, + }); +} #endif