MD Settings: make blowing away per-origin data (i.e. cookies) easier

chrome/browser/resources/settings/site_settings/site_data.html

Index: chrome/browser/resources/settings/site_settings/site_data.html
diff --git a/chrome/browser/resources/settings/site_settings/site_data.html b/chrome/browser/resources/settings/site_settings/site_data.html
index 111aa750114a329f0eb83bd7afaf5cac41b82ddd..6e04cb5f80af08a121102d977b70fb5067520e10 100644
--- a/chrome/browser/resources/settings/site_settings/site_data.html
+++ b/chrome/browser/resources/settings/site_settings/site_data.html
@@ -2,6 +2,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="../settings_page/settings_subpage_search.html">
 <link rel="import" href="../settings_shared_css.html">
@@ -11,10 +12,18 @@
 <dom-module id="site-data">
   <template>
     <style include="settings-shared">
-      paper-button#removeButton {
+      #removeShowingSites {
         -webkit-margin-start: auto;
       }
 
+      #removeSecondary {
+        -webkit-padding-start: 0;
+      }
+
+      .remove-site {
+        -webkit-margin-end: 0;
+      }
+
       .subtitle-row {
         margin-top: 9px;  /* With 15px in sub-items == 24px total margin. */
       }
@@ -28,10 +37,10 @@
       </settings-subpage-search>
     </div>
     <div class="settings-box continuation">
-      <paper-button class="secondary-button" id="removeButton"
-          on-tap="onConfirmDeleteMultipleSites_"
+      <paper-button class="secondary-button" id="removeShowingSites"
+          on-tap="onRemoveShowingSitesTap_"
           hidden$="[[!isRemoveButtonVisible_(sites, renderedItemCount)]]">
-          [[computeRemoveLabel_(filterString_)]]
+        [[computeRemoveLabel_(filterString_)]]
       </paper-button>
     </div>
     <div class="list-frame vertical-list">
@@ -44,6 +53,13 @@
             [[item.site]]
             <div class="secondary" id="siteSecondary">[[item.localData]]</div>
           </div>
+          <div class="secondary-action" id="removeSecondary">
+            <!-- TODO(dbeam): need an aria-label for this button. -->
+            <button is="paper-icon-button-light" class="remove-site"
+                on-tap="onRemoveSiteTap_">
+              <iron-icon icon="cr:delete"></iron-icon>
+            </button>
+          </div>
           <button class="subpage-arrow" is="paper-icon-button-light"
               aria-label="[[item.site]]"
               aria-describedby="siteSecondary"></button>