Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3850)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/commands/command_service.cc

Issue 60353008: Mac global keybindings (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years 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 | « no previous file | chrome/browser/extensions/extension_commands_global_registry_apitest.cc » ('j') | chrome/browser/extensions/extension_commands_global_registry_apitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/commands/command_service.cc
===================================================================
--- chrome/browser/extensions/api/commands/command_service.cc (revision 239014)
+++ chrome/browser/extensions/api/commands/command_service.cc (working copy)
@@ -79,10 +79,17 @@
}
bool IsWhitelistedGlobalShortcut(const extensions::Command& command) {
+ // Non-global shortcuts are always allowed.
if (!command.global())
return true;
+ // Global shortcuts must be (Ctrl|Command)-Shift-[0-9].
+#if defined OS_MACOSX
+ if (!command.accelerator().IsCmdDown())
+ return false;
+#else
if (!command.accelerator().IsCtrlDown())
return false;
+#endif
if (!command.accelerator().IsShiftDown())
return false;
return (command.accelerator().key_code() >= ui::VKEY_0 &&
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_commands_global_registry_apitest.cc » ('j') | chrome/browser/extensions/extension_commands_global_registry_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698