Mac global keybindings

chrome/browser/extensions/api/commands/command_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/commands/command_service.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 61 matching lines @@
   bool assigned = false;
   if (!prefs || !prefs->ReadPrefAsBoolean(extension_id,
                                           kInitialBindingsHaveBeenAssigned,
                                           &assigned))
     return false;
 
   return assigned;
 }
 
 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 &&
           command.accelerator().key_code() <= ui::VKEY_9);
 }
 
 }  // namespace
 
 namespace extensions {
 
@@ skipping 408 matching lines @@
 
   return true;
 }
 
 template <>
 void ProfileKeyedAPIFactory<CommandService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionCommandsGlobalRegistry::GetFactoryInstance());
 }
 
 }  // namespace extensions