diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-03-03 21:26:56 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-03 21:26:56 +0100 |
commit | 9626500a0ecefde76411b60aeb54051cfdbc90c4 (patch) | |
tree | 9f1608d9776d86cf3f100c9c1d73b9b5f76246ed /browser/components/preferences/in-content/main.js | |
parent | d252c5b2320859c58900b68a7f5ac82199aa1e83 (diff) | |
download | UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.gz UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.lz UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.tar.xz UXP-9626500a0ecefde76411b60aeb54051cfdbc90c4.zip |
Remove testing-only UI components for e10s
This removes front-end tools only applicable for testing e10s (open non-e10s window, etc.)
This resolves #37
Diffstat (limited to 'browser/components/preferences/in-content/main.js')
-rw-r--r-- | browser/components/preferences/in-content/main.js | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js index 4f20ba8c3..bac771bec 100644 --- a/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js @@ -11,11 +11,6 @@ Components.utils.import("resource:///modules/TransientPrefs.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); -if (AppConstants.E10S_TESTING_ONLY) { - XPCOMUtils.defineLazyModuleGetter(this, "UpdateUtils", - "resource://gre/modules/UpdateUtils.jsm"); -} - var gMainPane = { /** * Initialization of this. @@ -83,26 +78,6 @@ var gMainPane = { setEventListener("chooseFolder", "command", gMainPane.chooseFolder); - if (AppConstants.E10S_TESTING_ONLY) { - setEventListener("e10sAutoStart", "command", - gMainPane.enableE10SChange); - let e10sCheckbox = document.getElementById("e10sAutoStart"); - - let e10sPref = document.getElementById("browser.tabs.remote.autostart"); - let e10sTempPref = document.getElementById("e10sTempPref"); - let e10sForceEnable = document.getElementById("e10sForceEnable"); - - let preffedOn = e10sPref.value || e10sTempPref.value || e10sForceEnable.value; - - if (preffedOn) { - // The checkbox is checked if e10s is preffed on and enabled. - e10sCheckbox.checked = Services.appinfo.browserTabsRemoteAutostart; - - // but if it's force disabled, then the checkbox is disabled. - e10sCheckbox.disabled = !Services.appinfo.browserTabsRemoteAutostart; - } - } - if (AppConstants.MOZ_DEV_EDITION) { let uAppData = OS.Constants.Path.userApplicationDataDir; let ignoreSeparateProfile = OS.Path.join(uAppData, "ignore-dev-edition-profile"); @@ -123,36 +98,7 @@ var gMainPane = { enableE10SChange: function () { - if (AppConstants.E10S_TESTING_ONLY) { - let e10sCheckbox = document.getElementById("e10sAutoStart"); - let e10sPref = document.getElementById("browser.tabs.remote.autostart"); - let e10sTempPref = document.getElementById("e10sTempPref"); - - let prefsToChange; - if (e10sCheckbox.checked) { - // Enabling e10s autostart - prefsToChange = [e10sPref]; - } else { - // Disabling e10s autostart - prefsToChange = [e10sPref]; - if (e10sTempPref.value) { - prefsToChange.push(e10sTempPref); - } - } - - let buttonIndex = confirmRestartPrompt(e10sCheckbox.checked, 0, - true, false); - if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) { - for (let prefToChange of prefsToChange) { - prefToChange.value = e10sCheckbox.checked; - } - - Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart); - } - - // Revert the checkbox in case we didn't quit - e10sCheckbox.checked = e10sPref.value || e10sTempPref.value; - } + // **STUB** }, separateProfileModeChange: function () |