Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy. r=gfritzsche, a=lsblakk
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 20 Nov 2013 15:33:05 -0500
changeset 166555 f1f0c01ef96e9ca48b1110f8dcdb2d285913e7a9
parent 166554 97325de07f0086c247dcbacceb1527567f9bc242
child 166556 07df7f3a0306d38cf1c73bc9fec504bb9f786f85
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche, lsblakk
bugs941137
milestone27.0a2
Bug 941137 - Alter plugin defaults on the beta/release channel so that Java is still click-to-activate by default, but other plugins are not for the next few releases while we articulate a potential whitelist/transition strategy. r=gfritzsche, a=lsblakk
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -664,19 +664,28 @@ pref("pfs.datasource.url", "https://pfs.
 pref("plugins.hide_infobar_for_blocked_plugin", false);
 pref("plugins.hide_infobar_for_outdated_plugin", false);
 
 pref("plugins.update.url", "https://www.mozilla.org/%LOCALE%/plugincheck/");
 pref("plugins.update.notifyUser", false);
 
 pref("plugins.click_to_play", true);
 
-// let all plugins except Flash default to click-to-play
+#ifdef RELEASE_BUILD
+// For now, plugins other than Java and Flash are enabled in beta/release
+// and click-to-activate in earlier channels.
+pref("plugin.default.state", 2);
+#else
 pref("plugin.default.state", 1);
+#endif
+
+// Flash is enabled by default, and Java is click-to-activate by default on
+// all channels.
 pref("plugin.state.flash", 2);
+pref("plugin.state.java", 1);
 
 // 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);