Chromium Code Reviews| Index: chrome/browser/extensions/api/commands/command_service.cc |
| diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc |
| index 3656f4b98830ca5dbfcde76a2b77127600157e38..100b4fc67e83482537b59336b655e5c7b54041f6 100644 |
| --- a/chrome/browser/extensions/api/commands/command_service.cc |
| +++ b/chrome/browser/extensions/api/commands/command_service.cc |
| @@ -19,6 +19,7 @@ |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/accelerator_utils.h" |
| #include "chrome/common/extensions/api/commands/commands_handler.h" |
| +#include "chrome/common/extensions/extension_constants.h" |
| #include "chrome/common/extensions/manifest_handlers/ui_overrides_handler.h" |
| #include "chrome/common/pref_names.h" |
| #include "components/pref_registry/pref_registry_syncable.h" |
| @@ -564,6 +565,10 @@ bool CommandService::CanAutoAssign(const Command &command, |
| command.command_name() == manifest_values::kPageActionCommandEvent) |
| return false; // Browser and page actions are not global in nature. |
| + if (extension->id() == extension_misc::kChromeVoxExtensionId) { |
| + return true; |
| + } |
|
Finnur
2014/07/17 11:00:52
This seems a bit hacky. We already have a permissi
David Tseng
2014/07/18 22:54:50
Are you referring to _permission_features(.json)?
Finnur
2014/08/11 14:01:07
Yes, for example, you can check in code whether an
David Tseng
2014/08/19 22:47:49
A few cases. Suppose focus (in Chrome OS) is on th
Finnur
2014/08/20 12:41:14
OK, then that's definitely something you'd want to
|
| + |
| // Global shortcuts are restricted to (Ctrl|Command)+Shift+[0-9]. |
| #if defined OS_MACOSX |
| if (!command.accelerator().IsCmdDown()) |