[MD settings] site details url below Site details subpage title

This CL moves the site URL out of the subpage title and into the body of
the subpage. The new title is Site settings. In the new position, the
url has its favicon. This is similar to a previous revision done by
Finnur@.

BUG=646616
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2342473003
Cr-Commit-Position: refs/heads/master@{#419051}

chrome/app/settings_strings.grdp

@@ -1770,6 +1770,9 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_NO_ZOOMED_SITES" desc="A label explaining that no sites have a configured zoom in/out value.">
     No sites have been zoomed in or out.
   </message>
+  <message name="IDS_SETTINGS_SITE_DETAILS" desc="A title for the site settings details subpage.">
+    Site details
+  </message>
 
   <!-- Sync / People Page -->
   <message name="IDS_SETTINGS_PEOPLE" desc="Name of the settings page which manages Chrome's signed-in Google profile.">

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

@@ -299,7 +299,7 @@
         </settings-subpage>
       </template>
       <template is="dom-if" route-path="/siteSettings/siteDetails" no-search>
-        <settings-subpage page-title="[[selectedSite.originForDisplay]]">
+        <settings-subpage page-title="$i18n{siteSettingsSiteDetails}">
           <site-details site="[[selectedSite]]"></site-details>
         </settings-subpage>
       </template>

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

@@ -13,10 +13,20 @@
 <dom-module id="site-details">
   <template>
     <style include="settings-shared">
+      .favicon-image {
+        margin: 2px;
+      }
+
       #storage {
         -webkit-padding-end: 0;
       }
     </style>
+    <div class="settings-box first">
+      <div class="favicon-image"
+          style$="[[computeSiteIcon(site.originForDisplay)]]">
+      </div>
+      <div class="middle">[[site.originForDisplay]]</div>
+    </div>
     <div id="usage" hidden$="[[!storedData_]]">
       <div class="settings-box first">
         <h2>$i18n{siteSettingsUsage}</h2>
@@ -30,7 +40,7 @@
         </paper-item>
       </div>
     </div>
-    <div class="settings-box">
+    <div class="settings-box first">
       <h2>$i18n{siteSettingsPermissions}</h2>
     </div>
     <div class="list-frame">

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

@@ -1386,6 +1386,7 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source) {
       {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO},
       {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY},
       {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},
+      {"siteSettingsSiteDetails", IDS_SETTINGS_SITE_DETAILS},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));