Bug 1135375 - indicate we intend to ship in-content prefs with 38, r=jaws
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Sun, 22 Feb 2015 11:56:32 +0100
changeset 257350 e73203a690fe1b08e0f7b907fa5904589ad75312
parent 257304 0cefb584fd1aef8e3585fa6dee752c627f347d22
child 257351 3538fc10da63fa9333f2de1be4f90043345e94df
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1135375
milestone38.0a1
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
Bug 1135375 - indicate we intend to ship in-content prefs with 38, r=jaws
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -855,21 +855,17 @@ pref("browser.preferences.animateFadeIn"
 
 #ifdef XP_WIN
 pref("browser.preferences.instantApply", false);
 #else
 pref("browser.preferences.instantApply", true);
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
-#ifdef EARLY_BETA_OR_EARLIER
 pref("browser.preferences.inContent", true);
-#else
-pref("browser.preferences.inContent", false);
-#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