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

Unified Diff: ash/common/accelerators/accelerator_table.cc

Issue 2784393002: Deprecate Alt+Shift+K and replace it by Search+Shift+K (Closed)
Patch Set: Created 3 years, 9 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/ash_strings.grd ('k') | chrome/app/chromeos_strings.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_table.cc
diff --git a/ash/common/accelerators/accelerator_table.cc b/ash/common/accelerators/accelerator_table.cc
index 978486078d45cc16d02073791c6072747d0042bd..a44a3a0b36a1fa0558524bdab2f66c2d68b7f3a1 100644
--- a/ash/common/accelerators/accelerator_table.cc
+++ b/ash/common/accelerators/accelerator_table.cc
@@ -133,7 +133,7 @@ const AcceleratorData kAcceleratorData[] = {
{true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, SHOW_STYLUS_TOOLS},
{true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
SHOW_SYSTEM_TRAY_BUBBLE},
- {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+ {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
SHOW_IME_MENU_BUBBLE},
{true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0},
{true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1},
@@ -194,7 +194,11 @@ const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
// keyboard_overlay_data.js.
const AcceleratorData kDeprecatedAccelerators[] = {
{true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN},
- {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}};
+ {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER},
+
+ // Deprecated in M59.
+ {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+ SHOW_IME_MENU_BUBBLE}};
const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators);
@@ -207,7 +211,10 @@ const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = {
},
{SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager",
IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD,
- IDS_SHORTCUT_TASK_MANAGER_NEW, true}};
+ 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}};
const size_t kDeprecatedAcceleratorsDataLength =
arraysize(kDeprecatedAcceleratorsData);
« no previous file with comments | « ash/ash_strings.grd ('k') | chrome/app/chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698