Backed out changeset bd48de0a468d (bug 1023957) for bc1 test bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 18 Jun 2014 11:29:29 +0200
changeset 189386 6e4e98a7485d0baa8bfe7eb6e3e2cc265e3e1472
parent 189385 1140b6e20b843fb285d8611d3233101c773ec8be
child 189387 599ccafa98bcdcd9d270b5df7d95ae72af0ab08b
push id26986
push userryanvm@gmail.com
push dateWed, 18 Jun 2014 20:15:38 +0000
treeherdermozilla-central@f78e532e8a10 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1023957
milestone33.0a1
backs outbd48de0a468dda54ff61541678e236e773bda379
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset bd48de0a468d (bug 1023957) for bc1 test bustage
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -806,29 +806,25 @@ 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", false);
+pref("browser.preferences.inContent", true);
 
 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