Bug 1042300 - make in-content prefs nightly-only, r=MattN, a=lsblakk over IRC
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 22 Jul 2014 22:02:43 +0100
changeset 217245 4d2100935ac95cf03601b0b27c3a9df84e20f15e
parent 217244 cd2fe0d4f4a9ad3d729ee829fdf95b15545a4fff
child 217246 e91fe41e2d51a7e8ed82d2138ecb802b6cb45f49
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, lsblakk
bugs1042300
milestone33.0a2
Bug 1042300 - make in-content prefs nightly-only, r=MattN, a=lsblakk over IRC
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -807,25 +807,34 @@ pref("plugin.state.npmcffplg", 2);
 #ifdef XP_MACOSX
 pref("plugin.state.f5 ssl vpn plugin", 2);
 pref("plugin.state.f5 sam inspection host plugin", 2);
 #endif
 
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
-pref("browser.preferences.instantApply", true);
 #ifdef XP_MACOSX
 pref("browser.preferences.animateFadeIn", true);
 #else
 pref("browser.preferences.animateFadeIn", false);
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
+#ifdef NIGHTLY_BUILD
 pref("browser.preferences.inContent", true);
+pref("browser.preferences.instantApply", true);
+#else
+pref("browser.preferences.inContent", false);
+#ifdef XP_WIN
+pref("browser.preferences.instantApply", false);
+#else
+pref("browser.preferences.instantApply", true);
+#endif
+#endif
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);
 
 // Backspace and Shift+Backspace behavior
 // 0 goes Back/Forward
 // 1 act like PgUp/PgDown
 // 2 and other values, nothing