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 216925 5217e39df54c
parent 216922 7fefb97d2f75
child 216926 7b2887bd78a0
push id3971
push userjmathies@mozilla.com
push date2014-10-03 14:45 +0000
treeherdermozilla-beta@7b2887bd78a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe, sledru
bugs1068189
milestone33.0
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
@@ -4433,16 +4433,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;
 }