chrome/browser/ui/browser.cc - Issue 10444047: Modify Browser::IsReservedCommandOrKey() to make sure it returns false when an Ash shortcut is pres…

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/browser.cc

Issue 10444047: Modify Browser::IsReservedCommandOrKey() to make sure it returns false when an Ash shortcut is pres… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 8 years, 7 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/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 259099284eeda44650e8e3a86d02cd21445b61d3..1c0e25290cb7bafd9e79ade22db6dea1e5d5fa2e 100644

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

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

@@ -2318,10 +2318,12 @@ bool Browser::IsReservedCommandOrKey(int command_id,

// crbug.com/127333#c8

ui::KeyboardCode key_code =

static_cast<ui::KeyboardCode>(event.windowsKeyCode);

- if (key_code == ui::VKEY_F1 ||

- key_code == ui::VKEY_F2 ||

- key_code == ui::VKEY_F3 ||

- key_code == ui::VKEY_F4) {

+ if ((key_code == ui::VKEY_F1 ||

+ key_code == ui::VKEY_F2 ||

+ key_code == ui::VKEY_F3 ||

+ key_code == ui::VKEY_F4) &&

+ // Make sure it's a browser shortcut (i.e. not an Ash one like Alt+F4).

+ command_id != -1) {

return true;

}

#endif

« no previous file with comments | « no previous file | chrome/browser/ui/browser_unittest.cc » ('j') | no next file with comments »