Skip to content

GitLab

T
tangled
Commit eb1d49a9 authored by dmazzoni's avatar dmazzoni Committed by Commit bot
Browse files
Options

Add link to Settings page to add accessibility extensions. 

See bug for more context; this makes the "Accessibility" section show up
on all platforms, not just Chrome OS, and adds a link to the special
web store page with curated accessibility extensions.

BUG=416983

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

Cr-Commit-Position: refs/heads/master@{#296561}
parent f538bf10
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 151 deletions
chrome/app/chromeos_strings.grdp
View file @ eb1d49a9
...@@ -1826,9 +1826,6 @@ Press any key to continue exploring. ...@@ -1826,9 +1826,6 @@ Press any key to continue exploring.
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE"> <message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE">
Language Language
</message> </message>
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY">
Accessibility
</message>
<message name="IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION" desc="The 'Battery' button on the chrome://settings page."> <message name="IDS_OPTIONS_SETTINGS_BATTERY_DESCRIPTION" desc="The 'Battery' button on the chrome://settings page.">
Battery... Battery...
</message> </message>
......
chrome/app/generated_resources.grd
View file @ eb1d49a9
...@@ -11833,6 +11833,14 @@ Some features may be unavailable. Please check that the profile exists and you ...@@ -11833,6 +11833,14 @@ Some features may be unavailable. Please check that the profile exists and you
System System
</message> </message>
<!-- Accessibility options -->
<message name="IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY">
Accessibility
</message>
<message name="IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK">
Add additional accessibility features
</message>
<!-- Multiple download warning--> <!-- Multiple download warning-->
<message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction."> <message name="IDS_MULTI_DOWNLOAD_WARNING" desc="Warning invoked if multiple downloads are attempted without user interaction.">
This site is attempting to download multiple files. Do you want to allow this? This site is attempting to download multiple files. Do you want to allow this?
......
chrome/browser/resources/options/browser_options.html
View file @ eb1d49a9
...@@ -706,162 +706,176 @@ ...@@ -706,162 +706,176 @@
<if expr="chromeos"> <if expr="chromeos">
<include src="startup_section.html"> <include src="startup_section.html">
<section> </if>
<h3 i18n-content="accessibilityTitle"></h3>
<div class="option-control-table"> <section>
<p id="accessibility-explanation" class="settings-row"> <h3 i18n-content="accessibilityTitle"></h3>
<span i18n-content="accessibilityExplanation"></span>
<a id="accessibility-learn-more" target="_blank" <div>
i18n-content="learnMore"></a> <a href="https://chrome.google.com/webstore/category/collection/accessibility"
</p> id="accessibility-features" target="_blank"
<div class="option-name"> i18n-content="accessibilityFeaturesLink"></a>
<div class="checkbox controlled-setting-with-label"> </div>
<label>
<input <if expr="chromeos">
pref="settings.a11y.enable_menu" type="checkbox" <div class="option-control-table">
metric="Options_AccessibilitySystemMenu"> <p id="accessibility-explanation" class="settings-row">
<span> <span i18n-content="accessibilityExplanation"></span>
<span i18n-content="accessibilityAlwaysShowMenu"></span> <a id="accessibility-learn-more" target="_blank"
<span class="controlled-setting-indicator" i18n-content="learnMore"></a>
pref="settings.a11y.enable_menu"></span> </p>
</span> <div class="option-name">
</label> <div class="checkbox controlled-setting-with-label">
</div> <label>
<input
pref="settings.a11y.enable_menu" type="checkbox"
metric="Options_AccessibilitySystemMenu">
<span>
<span i18n-content="accessibilityAlwaysShowMenu"></span>
<span class="controlled-setting-indicator"
pref="settings.a11y.enable_menu"></span>
</span>
</label>
</div> </div>
<div class="option-name"> </div>
<div class="checkbox controlled-setting-with-label"> <div class="option-name">
<label> <div class="checkbox controlled-setting-with-label">
<input <label>
pref="settings.a11y.large_cursor_enabled" type="checkbox" <input
metric="Options_AccessibilityLargeMouseCursor"> pref="settings.a11y.large_cursor_enabled" type="checkbox"
<span> metric="Options_AccessibilityLargeMouseCursor">
<span i18n-content="accessibilityLargeCursor"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilityLargeCursor"></span>
pref="settings.a11y.large_cursor_enabled"></span> <span class="controlled-setting-indicator"
</span> pref="settings.a11y.large_cursor_enabled"></span>
</label> </span>
</div> </label>
</div> </div>
<div class="option-name"> </div>
<div class="checkbox controlled-setting-with-label"> <div class="option-name">
<label> <div class="checkbox controlled-setting-with-label">
<input id="accessibility-high-contrast-check" <label>
pref="settings.a11y.high_contrast_enabled" type="checkbox" <input id="accessibility-high-contrast-check"
metric="Options_AccessibilityHighContrastMode"> pref="settings.a11y.high_contrast_enabled" type="checkbox"
<span> metric="Options_AccessibilityHighContrastMode">
<span i18n-content="accessibilityHighContrast"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilityHighContrast"></span>
pref="settings.a11y.high_contrast_enabled"></span> <span class="controlled-setting-indicator"
</span> pref="settings.a11y.high_contrast_enabled"></span>
</label> </span>
</div> </label>
</div> </div>
<div id="accessibility-sticky-keys" class="option-name"> </div>
<div class="checkbox controlled-setting-with-label"> <div id="accessibility-sticky-keys" class="option-name">
<label> <div class="checkbox controlled-setting-with-label">
<input id="accessibility-sticky-keys-check" <label>
pref="settings.a11y.sticky_keys_enabled" type="checkbox" <input id="accessibility-sticky-keys-check"
metric="Options_AccessibilityStickyKeys"> pref="settings.a11y.sticky_keys_enabled" type="checkbox"
<span> metric="Options_AccessibilityStickyKeys">
<span i18n-content="accessibilityStickyKeys"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilityStickyKeys"></span>
pref="settings.a11y.sticky_keys_enabled"></span> <span class="controlled-setting-indicator"
</span> pref="settings.a11y.sticky_keys_enabled"></span>
</label> </span>
</div> </label>
</div> </div>
<div class="option-name"> </div>
<div class="checkbox controlled-setting-with-label"> <div class="option-name">
<label> <div class="checkbox controlled-setting-with-label">
<input id="accessibility-spoken-feedback-check" <label>
pref="settings.accessibility" type="checkbox" <input id="accessibility-spoken-feedback-check"
metric="Options_AccessibilitySpokenFeedback"> pref="settings.accessibility" type="checkbox"
<span> metric="Options_AccessibilitySpokenFeedback">
<span i18n-content="accessibilitySpokenFeedback"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilitySpokenFeedback"></span>
pref="settings.accessibility"></span> <span class="controlled-setting-indicator"
</span> pref="settings.accessibility"></span>
</label> </span>
<div id="accessibility-settings" hidden> </label>
<button id="accessibility-settings-button" <div id="accessibility-settings" hidden>
i18n-content="accessibilitySettings"></button> <button id="accessibility-settings-button"
</div> i18n-content="accessibilitySettings"></button>
</div> </div>
</div> </div>
<div class="option-name"> </div>
<div class="checkbox controlled-setting-with-label"> <div class="option-name">
<label> <div class="checkbox controlled-setting-with-label">
<input <label>
pref="settings.a11y.screen_magnifier" type="checkbox" <input
metric="Options_AccessibilityScreenMagnifier"> pref="settings.a11y.screen_magnifier" type="checkbox"
<span> metric="Options_AccessibilityScreenMagnifier">
<span i18n-content="accessibilityScreenMagnifier"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilityScreenMagnifier"></span>
pref="settings.a11y.screen_magnifier"></span> <span class="controlled-setting-indicator"
</span> pref="settings.a11y.screen_magnifier"></span>
</label> </span>
</div> </label>
</div> </div>
<div class="option-name" id="accessibility-tap-dragging"> </div>
<div class="checkbox"> <div class="option-name" id="accessibility-tap-dragging">
<label> <div class="checkbox">
<input id="accessibility-tap-dragging-check" <label>
pref="settings.touchpad.enable_tap_dragging" type="checkbox" <input id="accessibility-tap-dragging-check"
metric="Options_AccessibilityTapDragging"> pref="settings.touchpad.enable_tap_dragging" type="checkbox"
<span i18n-content="accessibilityTapDragging"></span> metric="Options_AccessibilityTapDragging">
</label> <span i18n-content="accessibilityTapDragging"></span>
</div> </label>
</div> </div>
<div class="option-name" id="accessibility-autoclick"> </div>
<div class="checkbox controlled-setting-with-label"> <div class="option-name" id="accessibility-autoclick">
<label> <div class="checkbox controlled-setting-with-label">
<input id="accessibility-autoclick-check" <label>
pref="settings.a11y.autoclick" type="checkbox"> <input id="accessibility-autoclick-check"
<span> pref="settings.a11y.autoclick" type="checkbox">
<span i18n-content="accessibilityAutoclick"></span> <span>
<span class="controlled-setting-indicator" <span i18n-content="accessibilityAutoclick"></span>
pref="settings.a11y.autoclick"></span> <span class="controlled-setting-indicator"
</span> pref="settings.a11y.autoclick"></span>
</label> </span>
</div> </label>
<div class="checkbox">
<!-- No whitespace between elements. -->
<input type="checkbox" class="spacer-checkbox"><span
id="accessibility-autoclick-label"
i18n-content="accessibilityAutoclickDropdown">
</span><select id="accessibility-autoclick-dropdown" class="control"
data-type="number"
aria-labelledby="accessibility-autoclick-label"
pref="settings.a11y.autoclick_delay_ms">
<option value="200"
i18n-content="autoclickDelayExtremelyShort"></option>
<option value="400"
i18n-content="autoclickDelayVeryShort"></option>
<option value="600" i18n-content="autoclickDelayShort">
</option>
<option value="800" i18n-content="autoclickDelayLong">
</option>
<option value="1000"
i18n-content="autoclickDelayVeryLong"></option>
</select>
<span class="controlled-setting-indicator"
pref="settings.a11y.autoclick_delay_ms"></span>
</div>
</div> </div>
<div class="option_name" id="accessibility_onscreen_keyboard"> <div class="checkbox">
<div class="checkbox controlled-setting-with-label"> <!-- No whitespace between elements. -->
<label> <input type="checkbox" class="spacer-checkbox"><span
<input pref="settings.a11y.virtual_keyboard" type="checkbox" id="accessibility-autoclick-label"
metric="Options_AccessibilityOnScreenKeyboard"> i18n-content="accessibilityAutoclickDropdown">
<span> </span><select id="accessibility-autoclick-dropdown" class="control"
<span i18n-content="accessibilityVirtualKeyboard"></span> data-type="number"
<span class="controlled-setting-indicator" aria-labelledby="accessibility-autoclick-label"
pref="settings.a11y.virtual_keyboard"></span> pref="settings.a11y.autoclick_delay_ms">
</span> <option value="200"
</label> i18n-content="autoclickDelayExtremelyShort"></option>
</div> <option value="400"
i18n-content="autoclickDelayVeryShort"></option>
<option value="600" i18n-content="autoclickDelayShort">
</option>
<option value="800" i18n-content="autoclickDelayLong">
</option>
<option value="1000"
i18n-content="autoclickDelayVeryLong"></option>
</select>
<span class="controlled-setting-indicator"
pref="settings.a11y.autoclick_delay_ms"></span>
</div> </div>
</section> </div>
<div class="option_name" id="accessibility_onscreen_keyboard">
<div class="checkbox controlled-setting-with-label">
<label>
<input pref="settings.a11y.virtual_keyboard" type="checkbox"
metric="Options_AccessibilityOnScreenKeyboard">
<span>
<span i18n-content="accessibilityVirtualKeyboard"></span>
<span class="controlled-setting-indicator"
pref="settings.a11y.virtual_keyboard"></span>
</span>
</label>
</div>
</div>
</div>
</if>
</section>
<if expr="chromeos"> <if expr="chromeos">
<section id="factory-reset-section" hidden> <section id="factory-reset-section" hidden>
<h3 i18n-content="factoryResetTitle"></h3> <h3 i18n-content="factoryResetTitle"></h3>
......
chrome/browser/ui/webui/options/browser_options_handler.cc
View file @ eb1d49a9
...@@ -362,6 +362,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { ...@@ -362,6 +362,10 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
{ "themes", IDS_THEMES_GROUP_NAME }, { "themes", IDS_THEMES_GROUP_NAME },
#endif #endif
{ "themesReset", IDS_THEMES_RESET_BUTTON }, { "themesReset", IDS_THEMES_RESET_BUTTON },
{ "accessibilityTitle",
IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
{ "accessibilityFeaturesLink",
IDS_OPTIONS_ACCESSIBILITY_FEATURES_LINK },
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
{ "accessibilityExplanation", { "accessibilityExplanation",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION }, IDS_OPTIONS_SETTINGS_ACCESSIBILITY_EXPLANATION },
...@@ -385,8 +389,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { ...@@ -385,8 +389,6 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION }, IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
{ "accessibilitySpokenFeedback", { "accessibilitySpokenFeedback",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION }, IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
{ "accessibilityTitle",
IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
{ "accessibilityVirtualKeyboard", { "accessibilityVirtualKeyboard",
IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
{ "accessibilityAlwaysShowMenu", { "accessibilityAlwaysShowMenu",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment