1 files changed, 16 insertions, 14 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/site_settings_category.html b/chromium/chrome/browser/resources/settings/site_settings/site_settings_category.html
index 8454782d0fe..4a08892c1da 100644
--- a/chromium/chrome/browser/resources/settings/site_settings/site_settings_category.html
+++ b/chromium/chrome/browser/resources/settings/site_settings/site_settings_category.html
@@ -1,12 +1,11 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/av-icons.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/communication-icons.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-item.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-body.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
+<link rel="import" href="chrome://md-settings/site_settings/add_site_dialog.html">
 <link rel="import" href="chrome://md-settings/site_settings/constants.html">
 <link rel="import" href="chrome://md-settings/site_settings/site_details.html">
 <link rel="import" href="chrome://md-settings/site_settings/site_list.html">
@@ -16,19 +15,18 @@
 <dom-module id="site-settings-category">
   <link rel="import" type="css" href="site_settings_category.css">
   <template>
-    <style include="settings-shared"></style>
-    <paper-icon-item>
-      <iron-icon icon="[[computeIconForContentCategory(category)]]"
-          item-icon></iron-icon>
-      <paper-item-body two-line class="flex">
-        <div>[[computeTitleForContentCategory(category)]]</div>
-        <div secondary>
-          [[computeCategoryDesc(category, categoryEnabled, showRecommendation)]]
-        </div>
-      </paper-item-body>
+    <style include="settings-shared">
+    paper-toggle-button {
+      --paper-toggle-button-label-spacing: 0;
+    }
+    </style>
+    <div class="settings-box first two-line">
+      <div class="start secondary">
+        [[computeCategoryDesc(category, categoryEnabled, showRecommendation)]]
+      </div>
       <paper-toggle-button id="toggle" checked="{{categoryEnabled}}"
           on-change="onToggleChange_"></paper-toggle-button>
-    </paper-icon-item>
+    </div>
     <settings-site-list id="blockList"
         category="[[category]]"
         current-route="{{currentRoute}}"
@@ -41,6 +39,10 @@
         category-enabled="[[categoryEnabled]]"
         selected-site="{{selectedSite}}">
     </settings-site-list>
+    <div class="button-container">
+      <paper-button on-tap="onAddSiteTap_" class="primary-button"
+          hidden$="[[categoryEnabled]]">$i18n{addSiteLink}</paper-button>
+    </div>
   </template>
   <script src="site_settings_category.js"></script>
 </dom-module>