MD Settings: show part of a11y page on Mac/Windows/Linux

R=tommycli@chromium.org
BUG=597880

Review URL: https://codereview.chromium.org/1835533003

Cr-Commit-Position: refs/heads/master@{#383333}

6 files changed, 19 insertions, 10 deletions

diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index cbad0cf..f54eade 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -10,10 +10,11 @@
   <message name="IDS_SETTINGS_ACCESSIBILITY" desc="Name of the settings page which displays accessibility preferences.">
     Accessibility
   </message>
+  <!-- TODO(dbeam): why is this "add additional"? Seems redundant. -->
+  <message name="IDS_SETTINGS_MORE_FEATURES_LINK" desc="Link which opens page where users can install extensions which provide additional accessibility features.">
+    Add additional accessibility features
+  </message>
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_MORE_FEATURES_LINK" desc="Link which opens page where users can install extensions which provide additional accessibility features.">
-      Add additional accessibility features
-    </message>
     <message name="IDS_SETTINGS_OPTIONS_IN_MENU_LABEL" desc="Label for checkbox which enables showing accessibility options in the system menu.">
       Show accessibility options in the system menu
     </message>
diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.html b/chrome/browser/resources/settings/a11y_page/a11y_page.html
index b8e37d1..25ae86f 100644
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.html
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html
@@ -1,11 +1,14 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<if expr="chromeos">
 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
+</if>
 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
 
 <dom-module id="settings-a11y-page">
   <template>
     <style include="settings-shared"></style>
+<if expr="chromeos">
     <div class="settings-box row first">
       <span i18n-content="a11yExplanation"></span>
       <a i18n-values="href:a11yLearnMoreUrl" i18n-content="learnMore"
@@ -76,10 +79,16 @@
         </settings-checkbox>
       </template>
     </div>
+</if>
 
+<if expr="chromeos">
     <div class="settings-box">
+</if>
+<if expr="not chromeos">
+    <div class="settings-box first">
+</if>
       <div class="button-strip">
-        <paper-button i18n-content="moreFeaturesLink"
+        <paper-button i18n-content="moreFeaturesLink" class="primary-button"
             on-tap="onMoreFeaturesTap_"></paper-button>
       </div>
     </div>
diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.js b/chrome/browser/resources/settings/a11y_page/a11y_page.js
index 109c99e..0c56580 100644
--- a/chrome/browser/resources/settings/a11y_page/a11y_page.js
+++ b/chrome/browser/resources/settings/a11y_page/a11y_page.js
@@ -26,6 +26,7 @@ Polymer({
       notify: true,
     },
 
+<if expr="chromeos">
     /**
      * Whether to show experimental accessibility features.
      * @private {boolean}
@@ -36,6 +37,7 @@ Polymer({
         return loadTimeData.getBoolean('showExperimentalA11yFeatures');
       },
     }
+</if>
   },
 
   /** @private */
diff --git a/chrome/browser/resources/settings/advanced_page/advanced_page.html b/chrome/browser/resources/settings/advanced_page/advanced_page.html
index 406f1bf..91b063f 100644
--- a/chrome/browser/resources/settings/advanced_page/advanced_page.html
+++ b/chrome/browser/resources/settings/advanced_page/advanced_page.html
@@ -1,5 +1,6 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
+<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html">
 <link rel="import" href="chrome://md-settings/languages_page/languages_page.html">
 <link rel="import" href="chrome://md-settings/passwords_and_forms_page/passwords_and_forms_page.html">
@@ -12,7 +13,6 @@
 <link rel="import" href="chrome://md-settings/site_settings/site_settings_category.html">
 
 <if expr="chromeos">
-<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
 <link rel="import" href="chrome://md-settings/bluetooth_page/bluetooth_page.html">
 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html">
 </if>
@@ -79,16 +79,12 @@
 
     <!-- TODO(dschuyler): Add Google Cloud Print section here. -->
 
-<if expr="chromeos">
-    <!-- TODO(dbeam): find somewhere to stuff "Add more accessibility features"
-         on desktop. -->
     <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp>
       <settings-section page-title="[[i18n('a11yPageTitle')]]"
           current-route="[[currentRoute]]" section="a11y">
         <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page>
       </settings-section>
     </template>
-</if>
 <if expr="not chromeos">
     <template is="dom-if" if="[[showPage(pageVisibility.system)]]" restamp>
       <settings-section page-title="[[i18n('systemPageTitle')]]"
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index c0eba2d..4cf76ed 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -14,6 +14,7 @@
     <structures>
       <structure name="IDR_SETTINGS_A11Y_PAGE_JS"
                  file="a11y_page/a11y_page.js"
+                 flattenhtml="true"
                  type="chrome_html" />
       <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"
                  file="a11y_page/a11y_page.html"
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 34ad2a75..471ff36 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -79,8 +79,8 @@ void AddCommonStrings(content::WebUIDataSource* html_source) {
 void AddA11yStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
     {"a11yPageTitle", IDS_SETTINGS_ACCESSIBILITY},
-#if defined(OS_CHROMEOS)
     {"moreFeaturesLink", IDS_SETTINGS_MORE_FEATURES_LINK},
+#if defined(OS_CHROMEOS)
     {"optionsInMenuLabel", IDS_SETTINGS_OPTIONS_IN_MENU_LABEL},
     {"largeMouseCursorLabel", IDS_SETTINGS_LARGE_MOUSE_CURSOR_LABEL},
     {"highContrastLabel", IDS_SETTINGS_HIGH_CONTRAST_LABEL},