Bug 1023957 - Disable the in-content preferences for Firefox 32. r=unfocused a=gavin
authorJared Wein <jwein@mozilla.com>
Wed, 18 Jun 2014 12:04:40 -0400
changeset 208170 67c27d331c7fdca6b971dc77bf64e420f8ed1498
parent 208169 1c68f46b02014569e2b3292b63f0a683758c9791
child 208171 6389357b5981ea02b24854d421ac9616777b5171
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersunfocused, gavin
bugs1023957
milestone32.0a2
Bug 1023957 - Disable the in-content preferences for Firefox 32. r=unfocused a=gavin
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -806,25 +806,29 @@ 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);
 
+#ifdef XP_WIN
+pref("browser.preferences.instantApply", false);
+#else
 pref("browser.preferences.instantApply", true);
+#endif
 #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
-pref("browser.preferences.inContent", true);
+pref("browser.preferences.inContent", false);
 
 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