Chromium Code Reviews| Index: chrome/browser/resources/options/browser_options.js |
| diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js |
| index 7d7200c5a87b8d75c45d6de6f31228dd9b27d1e9..07530c465a62f408fc33c2d678efa91596c564a8 100644 |
| --- a/chrome/browser/resources/options/browser_options.js |
| +++ b/chrome/browser/resources/options/browser_options.js |
| @@ -726,13 +726,13 @@ cr.define('options', function() { |
| // Accessibility section (CrOS only). |
| if (cr.isChromeOS) { |
| - var updateAccessibilitySettingsButton = function() { |
| + var updateAccessibilitySettingsButtons = function() { |
|
stevenjb
2016/08/08 22:41:03
As long as we are changing the name, maybe make it
yhanada
2016/08/09 06:29:40
Done.
|
| $('accessibility-settings').hidden = |
| !($('accessibility-spoken-feedback-check').checked); |
| }; |
| Preferences.getInstance().addEventListener( |
| 'settings.accessibility', |
| - updateAccessibilitySettingsButton); |
| + updateAccessibilitySettingsButtons); |
| $('accessibility-learn-more').onclick = function(unused_event) { |
| chrome.send('coreOptionsUserMetricsAction', |
| ['Options_AccessibilityLearnMore']); |
| @@ -740,9 +740,12 @@ cr.define('options', function() { |
| $('accessibility-settings-button').onclick = function(unused_event) { |
| window.open(loadTimeData.getString('accessibilitySettingsURL')); |
| }; |
| + $('talkback-settings-button').onclick = function(unused_event) { |
| + chrome.send('showAccessibilityTalkBackSettings'); |
| + }; |
| $('accessibility-spoken-feedback-check').onchange = |
| - updateAccessibilitySettingsButton; |
| - updateAccessibilitySettingsButton(); |
| + updateAccessibilitySettingsButtons; |
| + updateAccessibilitySettingsButtons(); |
| var updateScreenMagnifierCenterFocus = function() { |
| $('accessibility-screen-magnifier-center-focus-check').disabled = |
| @@ -834,11 +837,18 @@ cr.define('options', function() { |
| $('android-apps-settings-label').innerHTML = |
| loadTimeData.getString('androidAppsSettingsLabel'); |
| Preferences.getInstance().addEventListener('arc.enabled', function(e) { |
| - var settings = $('android-apps-settings'); |
| // Only change settings visibility on committed settings changes. |
| - if (!settings || e.value.uncommitted) |
| + if (e.value.uncommitted) |
| return; |
| - settings.hidden = !e.value.value; |
| + |
| + var isArcEnabled = !e.value.value; |
| + var androidAppSettings = $('android-apps-settings'); |
| + if (androidAppSettings != null) |
| + androidAppSettings.hidden = isArcEnabled; |
| + |
| + var talkbackSettingsButton = $('talkback-settings-button'); |
| + if (talkbackSettingsButton != null) |
| + talkbackSettingsButton.hidden = isArcEnabled; |
| }); |
| $('android-apps-settings-link').addEventListener('click', function(e) { |