Keep hackin' on MD downloads

chrome/browser/resources/md_downloads/item.html

Index: chrome/browser/resources/md_downloads/item.html
diff --git a/chrome/browser/resources/md_downloads/item.html b/chrome/browser/resources/md_downloads/item.html
index a3b13c7ab33cd09abc219a21a6b9f2b0b416a912..6a42bc22ef0881f9582c9471f572550efe53ad72 100644
--- a/chrome/browser/resources/md_downloads/item.html
+++ b/chrome/browser/resources/md_downloads/item.html
@@ -16,21 +16,26 @@
       <div id="date"></div>
     </div>
 
-    <paper-material id="safe" hidden$="[[isDangerous_]]"
-        on-dragstart="onDragStart_">
-      <div id="safe-icon-wrapper">
-        <img id="safe-icon" alt="">
+    <paper-material id="content" on-dragstart="onDragStart_">
+      <div class="icon-wrapper">
+        <img id="icon" alt="">
       </div>
+
       <div id="details">
-        <div id="title-area">
-          <a is="action-link" id="file-link" column-type="name"
-              on-click="onFileLinkClick_"></a>
-          <div id="name"></div>
+        <div id="title-area"><!-- Can't have any line breaks.
+          --><a is="action-link" id="file-link" column-type="name"
+              on-click="onFileLinkClick_"></a><!-- Before #name.
+          --><span id="name"></span>
+          <span id="tag"></span>
         </div>
-        <a id="src-url" target="_blank" column-type="url"></a>
-        <div id="status"></div>
+
+        <a id="url" target="_blank" column-type="url"></a>
+
+        <div id="description"></div>
+
         <paper-progress id="progress"></paper-progress>
-        <div id="button-container">
+
+        <div id="safe" class="controls" hidden$="[[isDangerous_]]">
           <cr-button id="show" column-type="show" on-click="onShowClick_"
               i18n-content="controlShowInFolder"></cr-button>
           <cr-button id="retry" column-type="retry" on-click="onRetryClick_"
@@ -44,33 +49,25 @@
           <span id="controlled-by"
               i18n-values=".innerHTML:controlByExtension"></span>
         </div>
+
+        <div id="dangerous" class="controls" hidden$="[[!isDangerous_]]">
+          <cr-button column-type="save" i18n-content="dangerRestore"
+              on-click="onRestoreOrSaveClick_"
+              hidden$="[[!isMalware_]]"></cr-button>
+          <cr-button column-type="save" i18n-content="dangerSave"
+              on-click="onRestoreOrSaveClick_"
+              hidden$="[[isMalware_]]"></cr-button>
+        </div>
       </div>
-      <div id="remove-wrapper">
-        <paper-icon-button id="safe-remove" column-type="remove" icon="clear"
-            on-click="onRemoveClick_"
-            i18n-content="controlRemoveFromList"></paper-icon-button>
-      </div>
-    </paper-material>
 
-    <paper-material id="dangerous" hidden$="[[!isDangerous_]]">
-      <img id="dangerous-icon" alt="">
-      <div id="description"></div>
-      <div id="malware-controls" hidden$="[[!isMalware_]]">
-        <cr-button id="restore" column-type="save"
-            on-click="onRestoreOrSaveClick_"
-            i18n-content="dangerRestore"></cr-button>
-        <cr-button id="dangerous-remove" column-type="discard"
-            on-click="onDangerousRemoveOrDiscardClick_"
-            i18n-content="controlRemoveFromList"></cr-button>
+      <div id="remove-wrapper" class="icon-wrapper">
+        <paper-icon-button id="remove" column-type="remove" icon="clear"
+            on-click="onRemoveClick_"></paper-icon-button>
       </div>
-      <button id="save" column-type="save" i18n-content="dangerSave"
-          on-click="onRestoreOrSaveClick_" hidden$="[[isMalware_]]"></button>
-      <button id="discard" column-type="discard" i18n-content="dangerDiscard"
-          on-click="onDangerousRemoveOrDiscardClick_"
-          hidden$="[[isMalware_]]"></button>
     </paper-material>
 
     <div id="end-cap"></div>
+
   </template>
   <link rel="import" type="css" href="chrome://resources/css/action_link.css">
   <link rel="import" type="css" href="chrome://downloads/shared_style.css">