Bug 873517: Update CSS selectors for Downloads indicator on Linux to show icon. r=mak

browser/components/downloads/content/indicator.js

@@ -168,6 +168,9 @@ const DownloadsButton = {
     placeholder.parentNode.insertBefore(indicator, placeholder);
     placeholder.collapsed = true;
     indicator.collapsed = false;
+    const kAreaType = "customizableui-areatype";
+    if (!indicator.getAttribute(kAreaType))
+      indicator.setAttribute(kAreaType, placeholder.getAttribute(kAreaType));
 
     indicator.open = this._anchorRequested;
 

browser/components/downloads/content/indicatorOverlay.xul

@@ -34,7 +34,6 @@
                    ondrop="DownloadsIndicatorView.onDrop(event);"
                    ondragover="DownloadsIndicatorView.onDragOver(event);"
                    ondragenter="DownloadsIndicatorView.onDragOver(event);"
-                   ondragleave="DownloadsIndicatorView.onDragLeave(event);"
                    skipintoolbarset="true">
       <!-- The panel's anchor area is smaller than the outer button, but must
            always be visible and must not move or resize when the indicator

browser/themes/linux/downloads/indicator.css

@@ -11,33 +11,19 @@
   position: relative;
 }
 
-toolbar[iconsize="small"] > #downloads-indicator > #downloads-indicator-anchor {
-  min-width: 16px;
-  min-height: 16px;
-}
-
-toolbar[iconsize="large"] > #downloads-indicator > #downloads-indicator-anchor {
+#downloads-indicator[customizableui-areatype="toolbar"] > #downloads-indicator-anchor {
   min-width: 24px;
   min-height: 24px;
 }
 
 /*** Main indicator icon ***/
 
-toolbar[iconsize="small"] > #downloads-indicator > #downloads-indicator-anchor > #downloads-indicator-icon {
-  background: -moz-image-rect(url("chrome://browser/skin/Toolbar-small.png"),
-                              0, 16, 16, 0) center no-repeat;
-}
-
-toolbar[iconsize="large"] > #downloads-indicator > #downloads-indicator-anchor > #downloads-indicator-icon {
+#downloads-indicator[customizableui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon {
   background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
                               0, 24, 24, 0) center no-repeat;
 }
 
-toolbar[iconsize="small"] > #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
-  background-image: url("chrome://browser/skin/downloads/download-glow-small.png");
-}
-
-toolbar[iconsize="large"] > #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
+#downloads-indicator[customizableui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
   background-image: url("chrome://browser/skin/downloads/download-glow.png");
 }