Back out b3c861bd1e2f (bug 785190) because it depends on bug 776208 on a CLOSED TREE
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 24 Aug 2012 15:34:50 -0700
changeset 105388 7058cad952ca4057bd5c009279f234cefa1ae038
parent 105387 ee747ea1354fdd302c34b092806b63eb046381b7
child 105389 f077de66e52d0f333f2eafe1ada66ade685a15f0
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
bugs785190, 776208
milestone17.0a1
backs outb3c861bd1e2fda67d732c0520c4c0eec997a7258
Back out b3c861bd1e2f (bug 785190) because it depends on bug 776208 on a CLOSED TREE
browser/base/content/browser-plugins.js
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -360,17 +360,17 @@ var gPluginHandler = {
     if (pluginsPermission == Ci.nsIPermissionManager.DENY_ACTION)
       return;
 
     let contentWindow = browser.contentWindow;
     let cwu = contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindowUtils);
     let pluginNeedsActivation = cwu.plugins.some(function(plugin) {
       let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
-      return gPluginHandler.canActivatePlugin(objLoadingContent);
+      return !objLoadingContent.activated;
     });
     if (pluginNeedsActivation)
       gPluginHandler._showClickToPlayNotification(browser);
   },
 
   _showClickToPlayNotification: function PH_showClickToPlayNotification(aBrowser) {
     aBrowser._clickToPlayDoorhangerShown = true;
     let contentWindow = aBrowser.contentWindow;