Standardize capitalization of Switch Access in the code base

Bug: 995052 Change-Id: If782994602e0b1b9d7b723be9417549b0eda125e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1902234 Reviewed-by: Alice Boxhall <[email protected]> Reviewed-by: Scott Violet <[email protected]> Reviewed-by: Ben Wells <[email protected]> Reviewed-by: Steven Holte <[email protected]> Commit-Queue: Anastasia Helfinstein <[email protected]> Cr-Commit-Position: refs/heads/master@{#714554}
scheib · Nov 12, 2019 · 4cc18b2 · 4cc18b2
1 parent 7d88ff3
commit 4cc18b2
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 24 deletions.
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
@@ -570,7 +570,7 @@ This file contains the strings for ash.
       <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_VIRTUAL_KEYBOARD" desc="The label used in the accessibility menu of the system tray to toggle on/off the onscreen keyboard.">
         On-screen keyboard
       </message>
-      <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SWITCH_ACCESS" desc="The label used in the accessibility menu of the system tray to toggle switch access, a feature that allows the entire device to be controlled with as few as 1 switch or button.">
+      <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_SWITCH_ACCESS" desc="The label used in the accessibility menu of the system tray to toggle Switch Access, a feature that allows the entire device to be controlled with as few as 1 switch or button.">
         Switch Access
       </message>
       <message name="IDS_ASH_STATUS_TRAY_ACCESSIBILITY_ADDITIONAL_SETTINGS" desc="The sub-header label for additional setting in accessibility menu of system tray.">

diff --git a/ash/public/cpp/ash_pref_names.cc b/ash/public/cpp/ash_pref_names.cc
@@ -80,7 +80,7 @@ const char kAccessibilityFocusHighlightEnabled[] =
 // A boolean pref which determines whether select-to-speak is enabled.
 const char kAccessibilitySelectToSpeakEnabled[] =
     "settings.a11y.select_to_speak";
-// A boolean pref which determines whether switch access is enabled.
+// A boolean pref which determines whether Switch Access is enabled.
 const char kAccessibilitySwitchAccessEnabled[] =
     "settings.a11y.switch_access.enabled";
 // A pref that stores the key code for the "select" action.
@@ -102,7 +102,7 @@ const char kAccessibilitySwitchAccessPreviousKeyCodes[] =
 const char kAccessibilitySwitchAccessPreviousSetting[] =
     "settings.a11y.switch_access.previous.setting";
 // A boolean pref which determines whether auto-scanning is enabled within
-// switch access.
+// Switch Access.
 const char kAccessibilitySwitchAccessAutoScanEnabled[] =
     "settings.a11y.switch_access.auto_scan.enabled";
 // An integer pref which determines time delay in ms before automatically

diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
@@ -511,11 +511,11 @@
     <message name="IDS_SETTINGS_ACCESSIBILITY_SELECT_TO_SPEAK_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Select-to-Speak feature.">
       Open select-to-speak settings
     </message>
-    <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to enable switch access (for users with limited motor control).">
-      Switch access (control the computer with just one or two switches)
+    <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION" desc="In the settings tab, the text next to the checkbox to enable Switch Access (for users with limited motor control).">
+      Switch Access (control the computer with just one or two switches)
     </message>
     <message name="IDS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_OPTIONS_LABEL" desc="In the settings tab, the label for the button that opens the Options page for the Switch Access feature.">
-      Switch access options
+      Switch Access options
     </message>
     <message name="IDS_SETTINGS_ACCESSIBILITY_TEXT_TO_SPEECH_HEADING" desc="In the settings tab, the heading for accessibility features that enable the computer to speak text from the computer screen.">
       Text-to-Speech

diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -919,8 +919,8 @@ void AccessibilityManager::OnSwitchAccessChanged() {
   if (!command_line->HasSwitch(
           ::switches::kEnableExperimentalAccessibilitySwitchAccess)) {
     if (enabled) {
-      LOG(WARNING) << "Switch access enabled but experimental accessibility "
-                   << "switch access flag is not set.";
+      LOG(WARNING) << "Switch Access enabled but experimental accessibility "
+                   << "Switch Access flag is not set.";
     }
     return;
   }

diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -214,10 +214,10 @@ class AccessibilityManager
   // Called when the Select-to-Speak extension state has changed.
   void OnSelectToSpeakStateChanged(ash::SelectToSpeakState state);
 
-  // Invoked to enable or disable switch access.
+  // Invoked to enable or disable Switch Access.
   void SetSwitchAccessEnabled(bool enabled);
 
-  // Returns if switch access is enabled.
+  // Returns if Switch Access is enabled.
   bool IsSwitchAccessEnabled() const;
 
   // Returns true if a braille display is connected to the system, otherwise

diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -110,7 +110,7 @@ const char kPropertyFocusHighlightEnabled[] = "a11yFocusHighlightEnabled";
 // Key which corresponds to the select-to-speak A11Y property in JS.
 const char kPropertySelectToSpeakEnabled[] = "a11ySelectToSpeakEnabled";
 
-// Key which corresponds to the switch access A11Y property in JS.
+// Key which corresponds to the Switch Access A11Y property in JS.
 const char kPropertySwitchAccessEnabled[] = "a11ySwitchAccessEnabled";
 
 // Key which corresponds to the send-function-keys property in JS.

diff --git a/chrome/browser/resources/chromeos/switch_access/menu_panel.js b/chrome/browser/resources/chromeos/switch_access/menu_panel.js
@@ -15,7 +15,7 @@ class Panel {
     this.menuManager_;
 
     /**
-     * Reference to switch access.
+     * Reference to Switch Access.
      * @private {SwitchAccessInterface}
      */
     this.switchAccess_;

diff --git a/chrome/browser/resources/chromeos/switch_access/switch_access.js b/chrome/browser/resources/chromeos/switch_access/switch_access.js
@@ -17,8 +17,6 @@ class SwitchAccess {
 
   /** @private */
   constructor() {
-    console.log('Switch access is enabled');
-
     /**
      * User commands.
      * @private {Commands}

diff --git a/chrome/common/extensions/api/accessibility_features.json b/chrome/common/extensions/api/accessibility_features.json
@@ -75,7 +75,7 @@
       },
       "switchAccess": {
         "$ref": "types.ChromeSetting",
-        "description": "<p><strong>ChromeOS only.</strong></p><p>Switch access. The value indicates whether the feature is enabled or not. <code>get()</code> requires <code>accessibilityFeatures.read</code> permission. <code>set()</code> and <code>clear()</code> require <code>accessibilityFeatures.modify</code> permission.</p>",
+        "description": "<p><strong>ChromeOS only.</strong></p><p>Switch Access. The value indicates whether the feature is enabled or not. <code>get()</code> requires <code>accessibilityFeatures.read</code> permission. <code>set()</code> and <code>clear()</code> require <code>accessibilityFeatures.modify</code> permission.</p>",
         "value": ["switchAccess", {"type": "boolean"}],
         "platforms": ["chromeos"]
       },

diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
@@ -210,9 +210,9 @@ extern const char kSelectToSpeakExtensionId[];
 // Path to preinstalled Select-to-speak extension (relative to
 // |chrome::DIR_RESOURCES|).
 extern const char kSelectToSpeakExtensionPath[];
-// The extension id of the Switch access extension.
+// The extension id of the Switch Access extension.
 extern const char kSwitchAccessExtensionId[];
-// Path to preinstalled Switch access extension (relative to
+// Path to preinstalled Switch Access extension (relative to
 // |chrome::DIR_RESOURCES|).
 extern const char kSwitchAccessExtensionPath[];
 // Name of the manifest file in an extension when a special manifest is used

diff --git a/docs/accessibility/overview.md b/docs/accessibility/overview.md
@@ -18,7 +18,7 @@ Assistive technology includes:
 * Screen readers for blind users that describe the screen using
   synthesized speech or braille
 * Voice control applications that let you speak to the computer,
-* Switch access that lets you control the computer with a small number
+* Switch Access that lets you control the computer with a small number
   of physical switches,
 * Magnifiers that magnify a portion of the screen, and often highlight the
   cursor and caret for easier viewing, and

diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml
@@ -15142,12 +15142,12 @@ should be able to be added at any place in this file.
 
 <action name="Options_AccessibilitySwitchAccess_Disable">
   <owner>[email protected]</owner>
-  <description>Settings: Accessibility: Disable switch access</description>
+  <description>Settings: Accessibility: Disable Switch Access</description>
 </action>
 
 <action name="Options_AccessibilitySwitchAccess_Enable">
   <owner>[email protected]</owner>
-  <description>Settings: Accessibility: Enable switch access</description>
+  <description>Settings: Accessibility: Enable Switch Access</description>
 </action>
 
 <action name="Options_AccessibilitySystemMenu_Disable">
@@ -21377,15 +21377,15 @@ should be able to be added at any place in this file.
   <owner>[email protected]</owner>
   <owner>[email protected]</owner>
   <description>
-    Ash system menu: Accessibility: Disable switch access
+    Ash system menu: Accessibility: Disable Switch Access
   </description>
 </action>
 
 <action name="StatusArea_SwitchAccessEnabled">
   <owner>[email protected]</owner>
   <owner>[email protected]</owner>
   <description>
-    Ash system menu: Accessibility: Enable switch access
+    Ash system menu: Accessibility: Enable Switch Access
   </description>
 </action>
 

diff --git a/tools/metrics/ukm/ukm.xml b/tools/metrics/ukm/ukm.xml
@@ -7248,7 +7248,7 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="IsSwitchAccessEnabled">
     <summary>
-      Boolean value to represent whether switch access is currently enabled.
+      Boolean value to represent whether Switch Access is currently enabled.
     </summary>
   </metric>
   <metric name="IsVideoPlaying">

diff --git a/ui/accessibility/accessibility_switches.h b/ui/accessibility/accessibility_switches.h
@@ -25,7 +25,7 @@ AX_EXPORT extern const char
 // Returns true if experimental accessibility language detection is enabled.
 AX_EXPORT bool IsExperimentalAccessibilityLanguageDetectionEnabled();
 
-// Returns true if experimental accessibility switch access text is enabled.
+// Returns true if experimental accessibility Switch Access text is enabled.
 AX_EXPORT bool IsExperimentalAccessibilitySwitchAccessTextEnabled();
 
 #if defined(OS_WIN)