Bug 1119368 - Enable in-content preferences for EARLY_BETA_OR_EARLIER before Beta 36. r=gijs
authorJared Wein <jwein@mozilla.com>
Thu, 08 Jan 2015 13:51:39 -0500
changeset 248548 1b59426310d4e912d714ecf96c608c8b43092fd2
parent 248547 9097517c27dbbb6fbdf8eaa3a54aaa9a27538378
child 248549 8e516e029c8e1ed988a6eb92f3e59032f9f2bd75
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs
bugs1119368
milestone37.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 1119368 - Enable in-content preferences for EARLY_BETA_OR_EARLIER before Beta 36. r=gijs
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -857,17 +857,17 @@ pref("plugin.state.iprint", 2);
 
 #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
-#ifndef RELEASE_BUILD
+#ifdef EARLY_BETA_OR_EARLIER
 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);