Bug 391670: Replace plugins icon. ui-r=beltzner, r=robstrong

browser/base/content/browser.js

@@ -5036,20 +5036,17 @@ missingPluginInstaller.prototype.newMissingPlugin = function(aEvent){
   var tabbrowser = getBrowser();
   const browsers = tabbrowser.mPanelContainer.childNodes;
 
-  var window = aEvent.target.ownerDocument.defaultView;
-  // walk up till the toplevel window
-  while (window.parent != window)
-    window = window.parent;
+  var contentWindow = aEvent.target.ownerDocument.defaultView.top;
 
   var i = 0;
   for (; i < browsers.length; i++) {
-    if (tabbrowser.getBrowserAtIndex(i).contentWindow == window)
+    if (tabbrowser.getBrowserAtIndex(i).contentWindow == contentWindow)
       break;
   }
 
   var tab = tabbrowser.mTabContainer.childNodes[i];
   if (!tab.missingPlugins)
-    tab.missingPlugins = new Object();
+    tab.missingPlugins = {};
 
   var pluginInfo = getPluginInfo(aEvent.target);
 
@@ -5068,7 +5065,7 @@ missingPluginInstaller.prototype.newMissingPlugin = function(aEvent){
     }];
 
     const priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-    const iconURL = "chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png";
+    const iconURL = "chrome://mozapps/skin/plugins/pluginGeneric.png";
     notificationBox.appendNotification(messageString, "missing-plugins",
                                        iconURL, priority, buttons);
   }

toolkit/mozapps/extensions/content/extensions.css

@@ -143,3 +143,8 @@ richlistitem[type="4"] .disableShow,
 richlistitem[type="4"] .disableHide {
   display: none;
 }
+
+richlistitem:not([plugin]) .pluginIcon ,
+richlistitem[plugin] .addonIcon:not(.pluginIcon) {
+  display: none;
+}

toolkit/mozapps/extensions/content/extensions.xml

@@ -392,6 +392,9 @@
         <xul:vbox pack="start" align="start">
           <xul:image class="addonIcon" xbl:inherits="src=iconURL"/>
         </xul:vbox>
+        <xul:vbox pack="start" align="start">
+          <xul:image class="addonIcon pluginIcon" src="chrome://mozapps/skin/plugins/pluginGeneric.png"/>
+        </xul:vbox>
         <xul:vbox pack="end" align="start">
           <xul:image class="notifyBadge"/>
         </xul:vbox>

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -16,6 +16,7 @@ classic.jar:
   skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
   skin/classic/mozapps/extensions/update.css                      (extensions/update.css)
   skin/classic/mozapps/plugins/missingPlugin.css                  (plugins/missingPlugin.css)
+  skin/classic/mozapps/plugins/pluginGeneric.png                  (plugins/pluginGeneric.png)
   skin/classic/mozapps/profile/profileicon.png                    (profile/profileicon.png)
   skin/classic/mozapps/profile/profileSelection.css               (profile/profileSelection.css)
   skin/classic/mozapps/shared/itemFader.png                       (shared/itemFader.png)

toolkit/themes/pinstripe/mozapps/plugins/missingPlugin.css

@@ -29,7 +29,7 @@ html|a {
 }
 
 #missingPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png);
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
   display: block;
   border: 0px;
   width: 32px;

toolkit/themes/winstripe/mozapps/jar.mn

@@ -16,6 +16,7 @@ classic.jar:
         skin/classic/mozapps/extensions/themeGeneric.png              (extensions/themeGeneric.png)
         skin/classic/mozapps/extensions/viewButtons.png               (extensions/viewButtons.png)
         skin/classic/mozapps/plugins/missingPlugin.css                (plugins/missingPlugin.css)
+        skin/classic/mozapps/plugins/pluginGeneric.png                (plugins/pluginGeneric.png)
         skin/classic/mozapps/plugins/pluginInstallerWizard.css        (plugins/pluginInstallerWizard.css)
         skin/classic/mozapps/profile/profileicon.png                  (profile/profileicon.png)
         skin/classic/mozapps/profile/profileSelection.css             (profile/profileSelection.css)

toolkit/themes/winstripe/mozapps/plugins/missingPlugin.css

@@ -41,7 +41,7 @@ html|a {
 }
 
 #missingPluginPlaceholder {
-  list-style-image: url(chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png);
+  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
   display: block;
   border: 0px;
   width: 32px;