Bug 518363: download manager: retry button always visible [r=mark.finkle]

mobile/chrome/content/bindings/downloads.xml

@@ -56,7 +56,7 @@
     </implementation>
   </binding>
 
-  <binding id="download-downloading" extends="chrome://browser/content/bindings/downloads.xml#download-base">
+  <binding id="download-downloading" extends="#download-base">
    <content orient="horizontal" align="start">
       <xul:image validate="always" xbl:inherits="src=iconURL"/>
       <xul:vbox flex="1">
@@ -76,7 +76,7 @@
     </content>
   </binding>
 
-  <binding id="download-paused" extends="chrome://browser/content/bindings/downloads.xml#download-base">
+  <binding id="download-paused" extends="#download-base">
    <content orient="horizontal" align="start">
       <xul:image validate="always" xbl:inherits="src=iconURL"/>
       <xul:vbox flex="1">
@@ -96,7 +96,7 @@
     </content>
   </binding>
 
-  <binding id="download-retry" extends="chrome://browser/content/bindings/downloads.xml#download-base">
+  <binding id="download-retry" extends="#download-base">
    <content orient="horizontal" align="start">
       <xul:image validate="always" xbl:inherits="src=iconURL"/>
       <xul:vbox flex="1">
@@ -106,14 +106,15 @@
         </xul:hbox>
         <xul:hbox>
           <xul:label class="normal" xbl:inherits="value=status" crop="end" flex="1"/>
-          <xul:button class="download-retry" label="&downloadRetry.label;"
+          <xul:label class="hide-on-select download-retry-failed normal" value="&downloadFailed.label;"/>
+          <xul:button class="show-on-select download-retry" label="&downloadRetry.label;"
                       oncommand="DownloadsView.retryDownload(document.getBindingParent(this));"/>
         </xul:hbox>
       </xul:vbox>
     </content>
   </binding>
 
-  <binding id="download-done" extends="chrome://browser/content/bindings/downloads.xml#download-base">
+  <binding id="download-done" extends="#download-base">
    <content orient="horizontal" align="start">
       <xul:image validate="always" xbl:inherits="src=iconURL"/>
       <xul:vbox flex="1">

mobile/chrome/content/downloads.js

@@ -275,7 +275,6 @@ var DownloadsView = {
     let strings = document.getElementById("bundle_browser");
 
     let status = "";
-    let state = Number(aItem.getAttribute("state"));
 
     // Display the file size, but show "Unknown" for negative sizes
     let fileSize = Number(aItem.getAttribute("maxBytes"));
@@ -286,7 +285,7 @@ var DownloadsView = {
       sizeText = this._replaceInsert(sizeText, 2, unit);
     }
 
-    // Insert 1 is the download size or download state
+    // Insert 1 is the download size
     status = this._replaceInsert(strings.getString("downloadsStatus"), 1, sizeText);
 
     // Insert 2 is the eTLD + 1 or other variations of the host

mobile/locales/en-US/chrome/browser.dtd

@@ -66,6 +66,7 @@
 <!ENTITY downloadResume.label      "Resume">
 <!ENTITY downloadRetry.label       "Retry">
 <!ENTITY downloadRemove.label      "Remove">
+<!ENTITY downloadFailed.label      "Failed">
 
 <!ENTITY noResults.label           "No results">
 <!ENTITY allBookmarks.label        "See all bookmarks">

mobile/themes/hildon/browser.css

@@ -404,6 +404,11 @@ toolbarbutton.page-button {
   -moz-image-region: rect(90px 78px 108px 0px);
 }
 
+/* downloads panel UI   ---------------------------------------------------- */
+.download-retry-failed {
+  color: red !important;
+}
+
 /* console panel UI   ------------------------------------------------------ */
 @media (orientation: landscape) {
   #console-filter-warnings,

mobile/themes/wince/browser.css

@@ -192,6 +192,11 @@ toolbarbutton.page-button {
   color: #aaa !important;
 }
 
+/* downloads panel UI   ---------------------------------------------------- */
+.download-retry-failed {
+  color: red !important;
+}
+
 /* console panel UI   ------------------------------------------------------ */
 @media (orientation: landscape) {
   #console-filter-warnings,