GUI option for disabling e10s

Author: K4sum1

browser/components/preferences/main.inc.xhtml

@@ -85,6 +85,13 @@
               preference="r3dfox.force.transparency"/>
   </hbox>
   <description class="indent tip-caption" data-l10n-id="r3dfox-transparency-desc"/>
+
+  <hbox align="center">
+    <checkbox id="r3dfoxe10s"
+              data-l10n-id="r3dfox-e10s"
+              preference="r3dfox.e10s.disabled"/>
+  </hbox>
+  <description class="indent tip-caption" data-l10n-id="r3dfox-e10s-desc"/>
 </groupbox>
 
 <html:template id="template-paneGeneral">

browser/components/preferences/main.js

@@ -67,6 +67,7 @@ Preferences.addAll([
   { id: "r3dfox.less.aero.fog", type: "bool" },
   { id: "r3dfox.aero.fog", type: "bool" },
   { id: "r3dfox.force.transparency", type: "bool" },
+  { id: "r3dfox.e10s.disabled", type: "bool" },
 
   /* Tab preferences
   Preferences:

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -177,6 +177,11 @@ r3dfox-transparency =
 
 r3dfox-transparency-desc = Force enables caption bar transparency, may have varying results.
 
+r3dfox-e10s =
+    .label = (BETA) Disable e10s (multiprocess)
+
+r3dfox-e10s-desc = Disables e10s/electrolysis. There are still multiple processes from other browser components with this enabled. Not recommended unless you know what you are doing.
+
 ## General Section - Startup
 
 startup-header = Startup

toolkit/xre/nsAppRunner.cpp

@@ -548,7 +548,7 @@ enum E10sStatus {
 static bool gBrowserTabsRemoteAutostart = false;
 static E10sStatus gBrowserTabsRemoteStatus;
 static bool gBrowserTabsRemoteAutostartInitialized = false;
-const char* kForceDisableE10sPref = "browser.e10s.disabled";
+const char* kForceDisableE10sPref = "r3dfox.e10s.disabled";
 
 namespace mozilla {