[MD settings] help button in content settings site lists

This CL removes the Learn more row button in the Content settings and puts that functionality in a new help button in the upper right of the subpage. BUG=658060 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation Review-Url: https://chromiumcodereview.appspot.com/2432383005 Cr-Commit-Position: refs/heads/master@{#426941}
Denger-Network · Oct 22, 2016 · 5805da7 · 5805da7
1 parent 99557fe
commit 5805da7
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 14 deletions.
diff --git a/chrome/browser/resources/settings/images/help_outline.svg b/chrome/browser/resources/settings/images/help_outline.svg
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -29,6 +29,10 @@
 <dom-module id="settings-privacy-page">
   <template>
     <style include="settings-shared">
+      button[is='paper-icon-button-light'].icon-help {
+        background-image: url(../images/help_outline.svg);
+      }
+
       /* TODO(dbeam): this is similar to a 1 line checkbox. Worth somehow
        * combining? */
       #metricsReporting {
@@ -187,6 +191,8 @@
       <template is="dom-if" route-path="/siteSettings/automaticDownloads"
           no-search>
         <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
@@ -196,6 +202,8 @@
       <template is="dom-if" route-path="/siteSettings/backgroundSync" no-search>
           no-search>
         <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
@@ -204,6 +212,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/camera" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.CAMERA}}">
@@ -213,6 +223,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/cookies" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.COOKIES}}">
@@ -229,6 +241,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/images" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.IMAGES}}">
@@ -237,6 +251,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/location" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.GEOLOCATION}}">
@@ -255,6 +271,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/javascript" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.JAVASCRIPT}}">
@@ -263,6 +281,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/keygen" no-search>
         <settings-subpage page-title="$i18n{siteSettingsKeygen}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.KEYGEN}}">
@@ -271,6 +291,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/microphone" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.MIC}}">
@@ -280,6 +302,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/notifications" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.NOTIFICATIONS}}">
@@ -288,6 +312,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/flash" no-search>
         <settings-subpage page-title="$i18n{siteSettingsFlash}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.PLUGINS}}">
@@ -296,6 +322,8 @@
       </template>
       <template is="dom-if" route-path="/siteSettings/popups" no-search>
         <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.POPUPS}}">
@@ -305,6 +333,8 @@
       <template is="dom-if" route-path="/siteSettings/unsandboxedPlugins"
           no-search>
         <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
+          <button class="icon-help subpage-title-extra"
+              is="paper-icon-button-light" on-tap="onHelpTap_"></button>
           <site-settings-category
               selected-site="{{selectedSite}}"
               category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js
@@ -95,6 +95,12 @@ Polymer({
     settings.navigateToPreviousRoute();
   },
 
+  /** @private */
+  onHelpTap_: function() {
+    window.open(
+        'https://support.google.com/chrome/?p=settings_manage_exceptions');
+  },
+
 <if expr="_google_chrome and not chromeos">
   /** @private */
   onMetricsReportingCheckboxTap_: function() {

diff --git a/chrome/browser/resources/settings/settings_page/settings_subpage.html b/chrome/browser/resources/settings/settings_page/settings_subpage.html
@@ -32,7 +32,8 @@
 
       h1 {
         color: var(--settings-nav-grey);
-        font-size: 107.6923%; /* go to 14px from 13px */
+        flex: 1;  /* Push other items to the end. */
+        font-size: 107.6923%;  /* Go to 14px from 13px */
         font-weight: 500;
       }
 
@@ -49,6 +50,7 @@ <h1>[[pageTitle]]</h1>
             on-search-changed="onSearchChanged_">
         </settings-subpage-search>
       </template>
+      <content select=".subpage-title-extra"></content>
     </div>
     <content></content>
   </template>

diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
@@ -20,11 +20,11 @@
         transform: scaleX(-1);  /* Flip on the X axis (aka mirror). */
       }
 
-      [actionable] button[is="paper-icon-button-light"].subpage-arrow {
+      [actionable] button[is='paper-icon-button-light'].subpage-arrow {
         background-image: url(images/arrow_right.svg);
       }
 
-      [actionable] button[is="paper-icon-button-light"].icon-external {
+      [actionable] button[is='paper-icon-button-light'].icon-external {
         background-image: url(images/open_in_new.svg);
       }
 

diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.html b/chrome/browser/resources/settings/site_settings/site_settings_category.html
@@ -56,19 +56,16 @@
 
     <content select=".cookie-controls"></content>
 
-    <div class="settings-box layout horizontal">
 <if expr="chromeos">
+    <div class="settings-box layout horizontal">
       <div class="flex" hidden$="[[!isPluginCategory_(category)]]">
           <div class="list-item list-button"
               on-tap="onAdobeFlashStorageClicked_">
             $i18n{adobeFlashStorage}
           </div>
       </div>
-</if>
-      <div class="list-item list-button" on-tap="onLearnMoreClicked_">
-        $i18n{learnMore}
-      </div>
     </div>
+</if>
 
     <site-list
         category="[[category]]"

diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.js b/chrome/browser/resources/settings/site_settings/site_settings_category.js
@@ -193,12 +193,6 @@ Polymer({
     return category == settings.ContentSettingsTypes.PLUGINS;
   },
 
-  /** @private */
-  onLearnMoreClicked_: function() {
-    window.open(
-        'https://support.google.com/chrome/?p=settings_manage_exceptions');
-  },
-
   /** @private */
   onAdobeFlashStorageClicked_: function() {
     window.open('https://www.macromedia.com/support/' +