Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1699)

Unified Diff: ash/accelerators/accelerator_table.cc

Issue 2971773003: Change Toggle High Contrast accelerator (Closed)
Patch Set: Rebase + Change commit message Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index a4cc7487a3c225dfa5865f6feddd9bbd0d7858d9..e3fc4d9810d597517122ce553cf6876036e41f68 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -69,7 +69,7 @@ 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_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+ {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN,
TOGGLE_HIGH_CONTRAST},
{true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
TOGGLE_SPOKEN_FEEDBACK},
@@ -203,7 +203,11 @@ const AcceleratorData kDeprecatedAccelerators[] = {
// Deprecated in M59.
{true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
- SHOW_IME_MENU_BUBBLE}};
+ SHOW_IME_MENU_BUBBLE},
+
+ // Deprecated in M61.
+ {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+ TOGGLE_HIGH_CONTRAST}};
const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators);
@@ -219,7 +223,14 @@ const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = {
IDS_SHORTCUT_TASK_MANAGER_NEW, true},
{SHOW_IME_MENU_BUBBLE, "Ash.Accelerators.Deprecated.ShowImeMenuBubble",
IDS_DEPRECATED_SHOW_IME_BUBBLE_MSG, IDS_SHORTCUT_IME_BUBBLE_OLD,
- IDS_SHORTCUT_IME_BUBBLE_NEW, true}};
+ IDS_SHORTCUT_IME_BUBBLE_NEW, true},
+ {
+ TOGGLE_HIGH_CONTRAST, "Ash.Accelerators.Deprecated.ToggleHighContrast",
+ IDS_DEPRECATED_TOGGLE_HIGH_CONTRAST_MSG,
+ IDS_SHORTCUT_TOGGLE_HIGH_CONTRAST_OLD,
+ IDS_SHORTCUT_TOGGLE_HIGH_CONTRAST_NEW,
+ false // Old accelerator was disabled immediately upon deprecation.
+ }};
const size_t kDeprecatedAcceleratorsDataLength =
arraysize(kDeprecatedAcceleratorsData);
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698