mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-15 22:35:43 +00:00
Bug 1042300 - make in-content prefs nightly-only, r=MattN
This commit is contained in:
parent
c4be424f79
commit
33e55bd7d7
@ -812,7 +812,6 @@ pref("plugin.state.f5 sam inspection host plugin", 2);
|
|||||||
// display door hanger if flash not installed
|
// display door hanger if flash not installed
|
||||||
pref("plugins.notifyMissingFlash", true);
|
pref("plugins.notifyMissingFlash", true);
|
||||||
|
|
||||||
pref("browser.preferences.instantApply", true);
|
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
pref("browser.preferences.animateFadeIn", true);
|
pref("browser.preferences.animateFadeIn", true);
|
||||||
#else
|
#else
|
||||||
@ -820,7 +819,17 @@ pref("browser.preferences.animateFadeIn", false);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Toggles between the two Preferences implementations, pop-up window and in-content
|
// Toggles between the two Preferences implementations, pop-up window and in-content
|
||||||
|
#ifdef NIGHTLY_BUILD
|
||||||
pref("browser.preferences.inContent", true);
|
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.show_plugins_in_list", true);
|
||||||
pref("browser.download.hide_plugins_without_extensions", true);
|
pref("browser.download.hide_plugins_without_extensions", true);
|
||||||
|
Loading…
Reference in New Issue
Block a user