Add link from the browser accessibility settings to the

'Manage accessibility features' system settings.

This CL replaces the 'Captions' link in ChromeOS browser settings with a deep link
to the 'Manage accessibility features' system settings page, which already contains
a link to the caption settings page.

Bug: 971264
Change-Id: I426e69af92176ba8b11fa937014b36a6482654f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850800Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#705601}

chrome/browser/resources/settings/a11y_page/a11y_page.html

@@ -22,10 +22,19 @@
     <settings-animated-pages id="pages" current-route="{{currentRoute}}"
         section="a11y" focus-config="[[focusConfig_]]">
       <div route-path="default">
-        <cr-link-row class="hr" id="captions" label="$i18n{captionsTitle}"
-            on-click="onCaptionsClick_" external$="[[captionSettingsOpensExternally_]]">
+<if expr="chromeos">
+        <cr-link-row class="hr" id="subpage-trigger"
+            label="$i18n{manageAccessibilityFeatures}"
+            on-click="onManageSystemAccessibilityFeaturesTap_"
+            sub-label="$i18n{moreFeaturesLinkDescription}"
+            hidden="[[showOsSettings_]]" external>
         </cr-link-row>
+</if>
 <if expr="not chromeos">
+        <cr-link-row class="hr" id="captions" label="$i18n{captionsTitle}"
+            on-click="onCaptionsClick_"
+            external$="[[captionSettingsOpensExternally_]]">
+        </cr-link-row>
         <settings-toggle-button
             id="a11yImageLabels"
             hidden$="[[!showAccessibilityLabelsSetting_]]"
@@ -36,7 +45,7 @@
         </settings-toggle-button>
 </if>
 <if expr="chromeos">
-        <template is="dom-if" if="[[pageVisibility.webstoreLink]]">
+        <template is="dom-if" if="[[showOsSettings_]]">
           <settings-toggle-button
               id="a11yImageLabels"
               hidden$="[[!showAccessibilityLabelsSetting_]]"
@@ -58,7 +67,7 @@
 </if>
         <cr-link-row class="hr" label="$i18n{moreFeaturesLink}"
             on-click="onMoreFeaturesLinkClick_" sub-label="$i18n{a11yWebStore}"
-            hidden="[[pageVisibility.webstoreLink]]" external>
+            hidden="[[showOsSettings_]]" external>
         </cr-link-row>
       </div>
 <if expr="not is_macosx">
@@ -73,7 +82,17 @@
       </template>
 </if>
 <if expr="chromeos">
-      <template is="dom-if" if="[[pageVisibility.webstoreLink]]">
+      <template is="dom-if" if="[[showCaptionSettings_]]">
+        <template is="dom-if" route-path="/manageAccessibility/captions">
+          <settings-subpage
+              associated-control="[[$$('#subpage-trigger')]]"
+              page-title="$i18n{captionsTitle}">
+            <settings-captions prefs="{{prefs}}">
+            </settings-captions>
+          </settings-subpage>
+        </template>
+      </template>
+      <template is="dom-if" if="[[showOsSettings_]]">
         <template is="dom-if" route-path="/manageAccessibility">
           <settings-subpage
               associated-control="[[$$('#subpage-trigger')]]"

chrome/browser/resources/settings/a11y_page/a11y_page.js

@@ -67,6 +67,17 @@ Polymer({
       },
     },
 
+    /**
+     * Whether to show OS settings.
+     * @private {boolean}
+     */
+    showOsSettings_: {
+      type: Boolean,
+      value: function() {
+        return loadTimeData.getBoolean('showOSSettings');
+      },
+    },
+
     /**
      * Whether the caption settings link opens externally.
      * @private {boolean}
@@ -136,6 +147,11 @@ Polymer({
   onManageAccessibilityFeaturesTap_: function() {
     settings.navigateTo(settings.routes.MANAGE_ACCESSIBILITY);
   },
+
+  /** @private */
+  onManageSystemAccessibilityFeaturesTap_: function() {
+    window.location.href = 'chrome://os-settings/manageAccessibility';
+  },
   // </if>
 
   /** private */