chrome/common/extensions/command.cc - Issue 180783012: Media Keys should not count towards the max of four shortcuts per extension.

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/common/extensions/command.cc

Issue 180783012: Media Keys should not count towards the max of four shortcuts per extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move IsMediaKey from c/b/e/a/c/command_service.h &&.cc to c/c/e/command.h && .cc Created 6 years, 10 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 | « chrome/common/extensions/command.h ('k') | chrome/test/data/extensions/manifest_tests/command_should_not_count_media_keys.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/command.cc

diff --git a/chrome/common/extensions/command.cc b/chrome/common/extensions/command.cc

index faed130a24d346706276d48701a12913c113a21f..5ebf3fc015760d17c03edfc6793d27e7ab283ffc 100644

--- a/chrome/common/extensions/command.cc

+++ b/chrome/common/extensions/command.cc

@@ -380,6 +380,17 @@ std::string Command::AcceleratorToString(const ui::Accelerator& accelerator) {

return shortcut;

}

+// static

+bool Command::IsMediaKey(const ui::Accelerator& accelerator) {

+ if (accelerator.modifiers() != 0)

+ return false;

+ return (accelerator.key_code() == ui::VKEY_MEDIA_NEXT_TRACK ||

+ accelerator.key_code() == ui::VKEY_MEDIA_PREV_TRACK ||

+ accelerator.key_code() == ui::VKEY_MEDIA_PLAY_PAUSE ||

+ accelerator.key_code() == ui::VKEY_MEDIA_STOP);

bool Command::Parse(const base::DictionaryValue* command,

const std::string& command_name,

int index,