chrome/browser/ui/views/accelerator_table.cc - Issue 1177773002: Deprecating high-conflict accelerators

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: oshima's comments Created 5 years, 3 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:

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 367b30b07aa68c8ff333dec50599a46832656f8e..021a2730b6343ab7e3a3afba611c580497cc1fbb 100644

--- a/chrome/browser/ui/views/accelerator_table.cc

+++ b/chrome/browser/ui/views/accelerator_table.cc

@@ -145,7 +145,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)

@@ -169,6 +168,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 },

{ 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 },