summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/command.h
diff options
context:
space:
mode:
authorzhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 04:07:59 +0000
committerzhchbin@gmail.com <zhchbin@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 04:07:59 +0000
commit5eb4043e4f5c9db268145817598197beb20e2f08 (patch)
treedfe83c5eca61e23167adb47b207383a49a1921f8 /chrome/common/extensions/command.h
parentdc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62 (diff)
downloadchromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.zip
chromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.tar.gz
chromium_src-5eb4043e4f5c9db268145817598197beb20e2f08.tar.bz2
Parse media keys for named command in the manifest.
BUG=131612 Review URL: https://chromiumcodereview.appspot.com/23445013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/command.h')
-rw-r--r--chrome/common/extensions/command.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/extensions/command.h b/chrome/common/extensions/command.h
index 77ff28a..963d26b 100644
--- a/chrome/common/extensions/command.h
+++ b/chrome/common/extensions/command.h
@@ -34,7 +34,8 @@ class Command {
// Parse a string as an accelerator. If the accelerator is unparsable then
// a generic ui::Accelerator object will be returns (with key_code Unknown).
- static ui::Accelerator StringToAccelerator(const std::string& accelerator);
+ static ui::Accelerator StringToAccelerator(const std::string& accelerator,
+ const std::string& command_name);
// Returns the string representation of an accelerator without localizing the
// shortcut text (like accelerator::GetShortcutText() does).