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

ash/common/accelerators/accelerator_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/accelerators/accelerator_table.h"
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "base/macros.h"
 
 namespace ash {
@@ skipping 54 matching lines @@
     {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
      OPEN_GET_HELP},
     {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH},
     {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      TOUCH_HUD_MODE_CHANGE},
     {true, ui::VKEY_I,
      ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
      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,
      SWITCH_TO_PREVIOUS_USER},
     {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
      SWITCH_TO_NEXT_USER},
     // Single shift release turns off caps lock.
     {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
     {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
     {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK},
@@ skipping 245 matching lines @@
     BRIGHTNESS_DOWN,
     BRIGHTNESS_UP,
     DEBUG_TOGGLE_TOUCH_PAD,
     DEBUG_TOGGLE_TOUCH_SCREEN,
     DEBUG_TOGGLE_TOUCH_VIEW,
     DEV_ADD_REMOVE_DISPLAY,
     DISABLE_CAPS_LOCK,
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_MIRROR_MODE,
     TOGGLE_WIFI,
     TOUCH_HUD_CLEAR,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
     POWER_PRESSED,
@@ skipping 43 matching lines @@
     DISABLE_CAPS_LOCK,
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     LOCK_SCREEN,
     POWER_PRESSED,
     POWER_RELEASED,
     SHOW_IME_MENU_BUBBLE,
     SUSPEND,
     SWAP_PRIMARY_DISPLAY,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif
 };
 
 const size_t kActionsAllowedAtModalWindowLength =
@@ skipping 42 matching lines @@
     DEV_ADD_REMOVE_DISPLAY,
     DEBUG_TOGGLE_TOUCH_PAD,
     DEBUG_TOGGLE_TOUCH_SCREEN,
     DISABLE_CAPS_LOCK,
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     POWER_PRESSED,
     POWER_RELEASED,
     SWAP_PRIMARY_DISPLAY,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_MIRROR_MODE,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     TOUCH_HUD_CLEAR,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif  // defined(OS_CHROMEOS)
 };
 
@@ skipping 42 matching lines @@
     TAKE_SCREENSHOT,
 #if defined(OS_CHROMEOS)
     BRIGHTNESS_DOWN,
     BRIGHTNESS_UP,
     DEBUG_TOGGLE_TOUCH_PAD,
     DEBUG_TOGGLE_TOUCH_SCREEN,
     DISABLE_CAPS_LOCK,
     KEYBOARD_BRIGHTNESS_DOWN,
     KEYBOARD_BRIGHTNESS_UP,
     TOGGLE_CAPS_LOCK,
-    TOGGLE_HIGH_CONTRAST,
     TOGGLE_SPOKEN_FEEDBACK,
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash