Begin whitelisting specific extensions for global key registration.

chrome/common/extensions/command.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/common/extensions/command.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 59 matching lines @@
         accelerator);
     return ui::Accelerator();
   }
 
   // Now, parse it into an accelerator.
   int modifiers = ui::EF_NONE;
   ui::KeyboardCode key = ui::VKEY_UNKNOWN;
   for (size_t i = 0; i < tokens.size(); i++) {
     if (tokens[i] == values::kKeyCtrl) {
       modifiers |= ui::EF_CONTROL_DOWN;
-    } else if (tokens[i] == values::kKeyCommand) {
-      if (platform_key == values::kKeybindingPlatformMac) {
+    } else if (tokens[i] == values::kKeyCommand ||
+               tokens[i] == values::kKeySearch) {
+      if (platform_key == values::kKeybindingPlatformMac ||
+          platform_key == values::kKeybindingPlatformChromeOs) {

[Finnur, 2014/08/21 16:23:32]

This still makes Search work as Command on Mac and Command as Search on
ChromeOS. That's not what we want. Isn't this taken care of by the other CL?
(can we drop these changes)

[David Tseng, 2014/08/21 17:24:51]

Bad rebase; done.

         // Either the developer specified Command+foo in the manifest for Mac or
         // they specified Ctrl and it got normalized to Command (to get Ctrl on
         // Mac the developer has to specify MacCtrl). Therefore we treat this
         // as Command.
+        // Search maps to command on Chrome OS.
         modifiers |= ui::EF_COMMAND_DOWN;
 #if defined(OS_MACOSX)
       } else if (platform_key == values::kKeybindingPlatformDefault) {
         // If we see "Command+foo" in the Default section it can mean two
         // things, depending on the platform:
         // The developer specified "Ctrl+foo" for Default and it got normalized
         // on Mac to "Command+foo". This is fine. Treat it as Command.
         modifiers |= ui::EF_COMMAND_DOWN;
 #endif
       } else {
@@ skipping 452 matching lines @@
   extension_data->SetBoolean("active", active);
   extension_data->SetString("keybinding", accelerator().GetShortcutText());
   extension_data->SetString("command_name", command_name());
   extension_data->SetString("extension_id", extension->id());
   extension_data->SetBoolean("global", global());
   extension_data->SetBoolean("extension_action", extension_action);
   return extension_data;
 }
 
 }  // namespace extensions