From c551f43206405019121bd2b2c93714319a0a3300 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 23 Jan 2020 17:21:03 +0100
Subject: BASELINE: Update Chromium to 79.0.3945.139

Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../settings/a11y_page/manage_a11y_page.html       | 48 ++++++++++++----------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'chromium/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html')

diff --git a/chromium/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html b/chromium/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
index 7f290fc3df3..ccc488cb561 100644
--- a/chromium/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
+++ b/chromium/chrome/browser/resources/settings/a11y_page/manage_a11y_page.html
@@ -80,31 +80,35 @@
         label="$i18n{screenMagnifierLabel}"
         disabled="[[prefs.ash.docked_magnifier.enabled.value]]">
     </settings-toggle-button>
-    <div class="settings-box continuation">
-      <div class="start sub-item settings-box-text">
-        $i18n{screenMagnifierZoomLabel}
+    <template is="dom-if" if="[[prefs.settings.a11y.screen_magnifier.value]]">
+      <div class="settings-box continuation">
+        <div class="start sub-item settings-box-text">
+          $i18n{screenMagnifierZoomLabel}
+        </div>
+        <settings-dropdown-menu label="$i18n{screenMagnifierZoomLabel}"
+            pref="{{prefs.settings.a11y.screen_magnifier_scale}}"
+            menu-options="[[screenMagnifierZoomOptions_]]"
+            disabled="[[!prefs.settings.a11y.screen_magnifier.value]]">
+        </settings-dropdown-menu>
       </div>
-      <settings-dropdown-menu label="$i18n{screenMagnifierZoomLabel}"
-          pref="{{prefs.settings.a11y.screen_magnifier_scale}}"
-          menu-options="[[screenMagnifierZoomOptions_]]"
-          disabled="[[!prefs.settings.a11y.screen_magnifier.value]]">
-      </settings-dropdown-menu>
-    </div>
+    </template>
     <settings-toggle-button
         pref="{{prefs.ash.docked_magnifier.enabled}}"
         label="$i18n{dockedMagnifierLabel}"
         disabled="[[prefs.settings.a11y.screen_magnifier.value]]">
     </settings-toggle-button>
-    <div class="settings-box continuation">
-      <div class="start sub-item settings-box-text">
-        $i18n{dockedMagnifierZoomLabel}
+    <template is="dom-if" if="[[prefs.ash.docked_magnifier.enabled.value]]">
+      <div class="settings-box continuation">
+        <div class="start sub-item settings-box-text">
+          $i18n{dockedMagnifierZoomLabel}
+        </div>
+        <settings-dropdown-menu label="$i18n{dockedMagnifierZoomLabel}"
+            pref="{{prefs.ash.docked_magnifier.scale}}"
+            menu-options="[[screenMagnifierZoomOptions_]]"
+            disabled="[[!prefs.ash.docked_magnifier.enabled.value]]">
+        </settings-dropdown-menu>
       </div>
-      <settings-dropdown-menu label="$i18n{dockedMagnifierZoomLabel}"
-          pref="{{prefs.ash.docked_magnifier.scale}}"
-          menu-options="[[screenMagnifierZoomOptions_]]"
-          disabled="[[!prefs.ash.docked_magnifier.enabled.value]]">
-      </settings-dropdown-menu>
-    </div>
+    </template>
     <cr-link-row class="hr" label="$i18n{displaySettingsTitle}"
         on-click="onDisplayTap_" sub-label="$i18n{displaySettingsDescription}"
         embedded></cr-link-row>
@@ -218,12 +222,14 @@
         on-click="onMouseTap_" sub-label="$i18n{mouseSettingsDescription}"
         embedded></cr-link-row>
 
-    <h2>$i18n{audioHeading}</h2>
-    <settings-toggle-button class="first"
+    <h2>$i18n{audioAndCaptionsHeading}</h2>
+    <cr-link-row class="first" label="$i18n{captionsTitle}"
+        on-click="onCaptionsClick_"></cr-link-row>
+    <settings-toggle-button
         pref="{{prefs.settings.a11y.mono_audio}}"
         label="$i18n{monoAudioLabel}">
     </settings-toggle-button>
-    <settings-toggle-button id="startupSoundEnabled" class="first"
+    <settings-toggle-button id="startupSoundEnabled"
         pref=" "
         on-change="toggleStartupSoundEnabled_"
         label="$i18n{startupSoundLabel}">
-- 
cgit v1.2.3