Bug 599794 - Disable plugins for b1 [r=mfinkle]
authorBenjamin Stover <bstover@mozilla.com>
Mon, 27 Sep 2010 15:36:36 -0700
changeset 66719 b9d7ced74b0be95cc39115e1a8fd2c87dddcdc27
parent 66718 30000dbee0ff5612130dd8665d559c841fa0d99b
child 66720 3b7c2fc03d48dff3652bace550e55811c44ac24d
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs599794
Bug 599794 - Disable plugins for b1 [r=mfinkle]
mobile/app/mobile.js
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -381,23 +381,18 @@ pref("browser.ui.pinch.scalingFactor", 5
 // Touch radius (area around the touch location to look for target elements):
 pref("browser.ui.touch.left", 8);
 pref("browser.ui.touch.right", 8);
 pref("browser.ui.touch.top", 12);
 pref("browser.ui.touch.bottom", 4);
 pref("browser.ui.touch.weight.visited", 120); // percentage
 
 // plugins
-#if ANDROID
 pref("plugin.disable", true);
 pref("dom.ipc.plugins.enabled", false);
-#else
-pref("plugin.disable", false);
-pref("dom.ipc.plugins.enabled", true);
-#endif
 
 // product URLs
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
 pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/");
 //pref("app.support.baseURL", "http://support.mozilla.com/1/mobile/%VERSION%/%OS%/%LOCALE%/");
 pref("app.support.baseURL", "http://mobile.support.mozilla.com/");
 pref("app.privacyURL", "https://www.mozilla.com/%LOCALE%/legal/privacy/firefox/mobile/");