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

Unified Diff: chrome/browser/ui/views/accelerator_table.cc

Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted whitespace from generated_resources.grd Created 5 years, 6 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
Index: chrome/browser/ui/views/accelerator_table.cc
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 1c022bd324e921590108112936ce87c0c03bd3bb..27d9abc9deba83fd8a70ac474d53d157ef2bf930 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -135,7 +135,6 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_F6, ui::EF_SHIFT_DOWN, IDC_FOCUS_PREVIOUS_PANE },
{ ui::VKEY_F10, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
{ ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN },
- { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
// Platform-specific key maps.
#if defined(OS_LINUX)
@@ -159,6 +158,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
IDC_TOUCH_HUD_PROJECTION_TOGGLE },
#else // OS_CHROMEOS
+ { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
oshima 2015/06/16 05:54:17 I believe this will make it impossible for web pag
afakhry 2015/06/16 22:30:33 This is intentional. Having this accelerator on Ch
oshima 2015/06/17 05:06:30 But this will change the current behavior, which I
{ ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
IDC_CLEAR_BROWSING_DATA },
{ ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },

Powered by Google App Engine
This is Rietveld 408576698