Bug 524413 - renable flash. r=mfinkle
authorDoug Turner <dougt@meer.net>
Mon, 26 Oct 2009 23:09:35 -0700
changeset 65722 d90650d25dc9024a8b935a6640382086f07b2d6e
parent 65721 84cc56c6c01d4db9e385794fc4d0c3757b513979
child 65723 64fe45e536bc771a7b8fc6bae5b3297d679c64b5
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
bugs524413
Bug 524413 - renable flash. r=mfinkle
mobile/app/mobile.js
mobile/chrome/content/browser.js
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -319,16 +319,20 @@ pref("privacy.item.formdata", true);
 pref("privacy.item.downloads", true);
 pref("privacy.item.passwords", true);
 pref("privacy.item.sessions", true);
 pref("privacy.item.geolocation", true);
 pref("privacy.item.siteSettings", true);
 
 pref("plugins.enabled", true);
 
+#ifdef MOZ_PLATFORM_HILDON
+pref("plugins.force.wmode", "opaque");
+#endif
+
 // URL to the Learn More link XXX this is the firefox one.  Bug XXX fixes this.
 pref("browser.geolocation.warning.infoURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/geolocation/");
 
 // base url for the wifi geolocation network provider
 pref("geo.wifi.uri", "https://www.google.com/loc/json");
 
 // enable geo
 pref("geo.enabled", true);
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -545,27 +545,33 @@ var Browser = {
   
         let alerts = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
         alerts.showAlertNotification(URI_GENERIC_ICON_XPINSTALL, strings.getString("alertAddons"),
                                      label, false, "", null);
       }
       gPrefService.clearUserPref("extensions.disabledAddons");
     }
 
+    // some day (maybe fennec 1.0), we can remove both of these
+    // preference reseting checks.  they are here because we wanted to
+    // disable plugins and flash explictly, then we fixed things and
+    // needed to re-enable support.  as time goes on, fewer people
+    // will have ever had these temporary.* preference set.
+
     // Re-enable plugins if we had previously disabled them. We should get rid of
     // this code eventually...
     if (gPrefService.prefHasUserValue("temporary.disablePlugins")) {
       gPrefService.clearUserPref("temporary.disablePlugins");
       this.setPluginState(true);
     }
 
-    // XXX temporarily disable flash
-    if (!gPrefService.prefHasUserValue("temporary.disabledFlash")) {
-      this.setPluginState(false, /flash/i);
-      gPrefService.setBoolPref("temporary.disabledFlash", true);
+    // Re-enable flash
+    if (gPrefService.prefHasUserValue("temporary.disabledFlash")) {
+      this.setPluginState(true, /flash/i);
+      gPrefService.clearUserPref("temporary.disabledFlash");
     }
 
     //dump("end startup\n");
   },
 
   shutdown: function() {
     this._browserView.uninit();
     BrowserUI.uninit();