Bug 1253605 - Do not display e10s checkbox as checked if e10s was blocked. r=jimm
authorFelipe Gomes <felipc@gmail.com>
Fri, 04 Mar 2016 11:51:13 -0300
changeset 323158 d365dfe0cf983c6f413a17f89ba47d6081bdecd0
parent 323157 c733bc1211ac32b13cb228d5e2ac146afd0acffc
child 323159 60444e696cfc83d505e96224850744643135b2ce
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1253605
milestone47.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
Bug 1253605 - Do not display e10s checkbox as checked if e10s was blocked. r=jimm MozReview-Commit-ID: 50u5Vx8B5kj
browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -90,18 +90,18 @@ var gMainPane = {
 
     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.
-      e10sCheckbox.checked = true;
+      // 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;
     }
 
 #endif
 
 #ifdef MOZ_DEV_EDITION