Merge to M55: Revert of Add Ctrl+Alt+H as global shortcut to toggle high contrast mode. (patchset #…

ash/common/accelerators/accelerator_table.cc

Index: ash/common/accelerators/accelerator_table.cc
diff --git a/ash/common/accelerators/accelerator_table.cc b/ash/common/accelerators/accelerator_table.cc
index 87d678640c73a16c0900dc0cfc962f5d4a12e40a..c7343017c921e9923c36185fe476f8d64c902e02 100644
--- a/ash/common/accelerators/accelerator_table.cc
+++ b/ash/common/accelerators/accelerator_table.cc
@@ -72,8 +72,9 @@ const AcceleratorData kAcceleratorData[] = {
      TOUCH_HUD_CLEAR},
     {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      TOUCH_HUD_PROJECTION_TOGGLE},
-    {true, ui::VKEY_H, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-     TOGGLE_HIGH_CONTRAST},
+    // Accessibility: Spoken feedback shortcuts. The first one is to toggle
+    // spoken feedback on or off. The others are only valid when
+    // spoken feedback is enabled.
     {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      TOGGLE_SPOKEN_FEEDBACK},
     {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
@@ -339,7 +340,6 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_MIRROR_MODE,
     TOGGLE_WIFI,
@@ -403,7 +403,6 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
     SUSPEND,
     SWAP_PRIMARY_DISPLAY,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
@@ -466,7 +465,6 @@ const AcceleratorAction kActionsAllowedInAppModeOrPinnedMode[] = {
     POWER_RELEASED,
     SWAP_PRIMARY_DISPLAY,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
@@ -529,7 +527,6 @@ const AcceleratorAction kActionsKeepingMenuOpen[] = {
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,