chrome/browser/extensions/extension_keybinding_registry.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/browser/extensions/extension_keybinding_registry.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/browser/extensions/api/commands/command_service.cc ('k') | chrome/browser/extensions/global_shortcut_listener_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_keybinding_registry.cc

diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc

index 24b80a3bb3d37c6de7930db83276fb89edf368cc..5a62d00f1698bc4a0e57b91d9e657fd4614b1c46 100644

--- a/chrome/browser/extensions/extension_keybinding_registry.cc

+++ b/chrome/browser/extensions/extension_keybinding_registry.cc

@@ -7,9 +7,9 @@

#include "base/values.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/active_tab_permission_granter.h"

-#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/common/extensions/command.h"

#include "content/public/browser/browser_context.h"

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_system.h"

@@ -144,7 +144,7 @@ void ExtensionKeybindingRegistry::AddEventTarget(

std::make_pair(extension_id, command_name));

// Shortcuts except media keys have only one target in the list. See comment

// about |event_targets_|.

- if (!extensions::CommandService::IsMediaKey(accelerator))

+ if (!extensions::Command::IsMediaKey(accelerator))

DCHECK_EQ(1u, event_targets_[accelerator].size());

}