Bug 1068189 - Force disable browser.tabs.remote.autostart in non-nightly builds. r=felipe, a=sledru
authorJim Mathies <jmathies@mozilla.com>
Tue, 23 Sep 2014 09:41:59 -0500
changeset 225163 4a2494b6356128f7ff3e8c82d8f08047d163632e
parent 225162 0aeaf633aef3e1e93a7243a426668aad231569bb
child 225164 f764e665b39c8846ef712d043ddcb2881dc4fb24
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe, sledru
bugs1068189
milestone34.0a2
Bug 1068189 - Force disable browser.tabs.remote.autostart in non-nightly builds. r=felipe, a=sledru
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4521,16 +4521,19 @@ mozilla::BrowserTabsRemote()
   }
 
   return gBrowserTabsRemote;
 }
 
 bool
 mozilla::BrowserTabsRemoteAutostart()
 {
+#if !defined(NIGHTLY_BUILD)
+  return false;
+#endif
   if (!gBrowserTabsRemoteAutostartInitialized) {
     gBrowserTabsRemoteAutostart = !gSafeMode &&
                                   Preferences::GetBool("browser.tabs.remote.autostart", false);
     gBrowserTabsRemoteAutostartInitialized = true;
   }
 
   return gBrowserTabsRemoteAutostart;
 }