Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1042300 - make in-content prefs nightly-only, r=MattN

Browse Source
This commit is contained in:
Gijs Kruitbosch 2014-07-22 22:02:43 +01:00
parent c4be424f79
commit 33e55bd7d7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browser/app/profile/firefox.js
View File

@ -812,7 +812,6 @@ pref("plugin.state.f5 sam inspection host plugin", 2);
// 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
@ -820,7 +819,17 @@ 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);