Settings: Update Site Settings page for All Sites.

Update the "Site Settings" page in chrome://settings with new strings and add
headings.

This change is gated behind the #site-settings flag.

Bug: 835712
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I944e14d1009a96f6728a9dbd0917136c27894fe5
Reviewed-on: https://chromium-review.googlesource.com/1036707
Commit-Queue: Patti <patricialor@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555655}

chrome/app/settings_strings.grdp

@@ -2571,6 +2571,9 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES" desc="Label for the all sites site settings.">
     All sites
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_DESCRIPTION" desc="Label for the button linking to the All Sites page.">
+    View permissions and data stored across sites
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_ADS" desc="Label for the ads site settings.">
     Ads
   </message>

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_DESCRIPTION.png.sha1

+fc034e0d9052266d45607f96890175e22109c2ee
\ No newline at end of file

chrome/browser/resources/settings/icons.html

@@ -93,7 +93,6 @@ List icons here rather than importing large sets of (e.g. Polymer) icons.
 <if expr="chromeos">
       <g id="laptop-chromebook"><path d="M22 18V3H2v15H0v2h24v-2h-2zm-8 0h-4v-1h4v1zm6-3H4V5h16v10z"></path></g>
 </if>
-      <g id="list"><path d="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7z"></path></g>
       <g id="location-on"><path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"></path></g>
       <g id="mic"><path d="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6 6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z"></path></g>
       <g id="midi"><path d="M21,19.1H3V5h18V19.1z M21,3H3C1.9,3,1,3.9,1,5v14c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2V5C23,3.9,22.1,3,21,3z"></path><path fill="none" d="M21,19.1H3V5h18V19.1z M21,3H3C1.9,3,1,3.9,1,5v14c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2V5C23,3.9,22.1,3,21,3z"></path><path d="M14,5h3v8h-3V5z"></path><path d="M15,12h1v8h-1V12z"></path><path fill="none" d="M0,0h24v24H0V0z"></path><rect x="7" y="5" width="3" height="8"></rect><rect x="8" y="12" width="1" height="8"></rect></g>

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -167,7 +167,7 @@
       </template>
 
       <template is="dom-if" route-path="/content/all" no-search>
-        <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
+        <settings-subpage page-title="$i18n{siteSettingsAllSites}">
           <all-sites></all-sites>
         </settings-subpage>
       </template>

chrome/browser/resources/settings/settings_shared_css.html

@@ -241,6 +241,10 @@
         border-top: none;
       }
 
+      h2.first {
+        padding-top: 0;
+      }
+
       .settings-box.block {
         display: block;
       }

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

@@ -55,8 +55,8 @@
 
     <template is="dom-if" if="[[enableSiteSettings_]]">
       <div id="usage">
-        <div class="settings-box first">
-          <h2>$i18n{siteSettingsUsage}</h2>
+        <div class="settings-box first line-only">
+          <h2 class="first">$i18n{siteSettingsUsage}</h2>
         </div>
         <div class="list-frame">
           <div class="list-item" id="noStorage"

chrome/browser/resources/settings/site_settings_page/site_settings_page.html

@@ -18,15 +18,18 @@
       }
     </style>
     <template is="dom-if" if="[[enableSiteSettings_]]">
-      <div class="settings-box first" category$="[[ALL_SITES]]"
+      <div class="settings-box first line-only">
+        <h2 class="first">$i18n{siteSettingsAllSites}</h2>
+      </div>
+      <div class="settings-box first line-only" category$="[[ALL_SITES]]"
           data-route="SITE_SETTINGS_ALL" on-click="onTapNavigate_" actionable>
-        <iron-icon icon="settings:list"></iron-icon>
-        <div class="middle">$i18n{siteSettingsCategoryAllSites}</div>
+        <div class="start">$i18n{siteSettingsAllSitesDescription}</div>
         <paper-icon-button-light class="subpage-arrow">
-          <button aria-label="$i18n{siteSettingsCategoryAllSites}"></button>
+          <button aria-label="$i18n{siteSettingsAllSitesDescription}"></button>
         </paper-icon-button-light>
       </div>
-      <div class="settings-box line-only">
+      <div class="settings-box first line-only">
+        <h2>$i18n{siteSettingsPermissions}</h2>
       </div>
     </template>
     <div id="cookies" class="settings-box two-line first"

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -2099,7 +2099,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
     {"sharedWorkerName", IDS_SETTINGS_COOKIES_COOKIE_NAME_LABEL},
     {"webdbDesc", IDS_SETTINGS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL},
     {"siteSettingsCategoryPageTitle", IDS_SETTINGS_SITE_SETTINGS_CATEGORY},
-    {"siteSettingsCategoryAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
     {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
     {"siteSettingsCameraLabel", IDS_SETTINGS_SITE_SETTINGS_CAMERA_LABEL},
     {"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
@@ -2114,6 +2113,8 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
     {"siteSettingsCategoryPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
     {"siteSettingsCategoryZoomLevels", IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS},
     {"siteSettingsAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
+    {"siteSettingsAllSitesDescription",
+     IDS_SETTINGS_SITE_SETTINGS_ALL_SITES_DESCRIPTION},
     {"siteSettingsAutomaticDownloads",
      IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS},
     {"siteSettingsBackgroundSync", IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC},