diff options
| author | zhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 18:33:35 +0000 |
|---|---|---|
| committer | zhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-28 18:33:35 +0000 |
| commit | c73236512b5285e65eeda627f94ddce51fcda16f (patch) | |
| tree | 2af47d796869e17dc7e0b842629e707643928129 /chrome/browser/extensions/extension_keybinding_registry.cc | |
| parent | c457e8fadd95ca31883010b1da1ab5704b5bfd8f (diff) | |
| download | chromium_src-c73236512b5285e65eeda627f94ddce51fcda16f.zip chromium_src-c73236512b5285e65eeda627f94ddce51fcda16f.tar.gz chromium_src-c73236512b5285e65eeda627f94ddce51fcda16f.tar.bz2 | |
Media Keys should not count towards the max of four shortcuts per extension.
R=finnur@chromium.org
TEST=unit_tests --gtest_filter=CommandsManifestTest.CommandManifestShouldNotCountMediaKeys
BUG=329870
Review URL: https://codereview.chromium.org/180783012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_keybinding_registry.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_keybinding_registry.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc index 24b80a3..5a62d00 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()); } |