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) {

[Finnur, 2014/08/21 11:18:11]

This isn't right. This makes Search map over to Command on Mac and allows
Command to be mapped to Search on ChromeOS, which we don't want.

[David Tseng, 2014/08/21 16:03:04]

Hmm...this cl was branched off of the other change. Let me rebase and upload
again.

+      if (platform_key == values::kKeybindingPlatformMac ||
+          platform_key == values::kKeybindingPlatformChromeOs) {
         // 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 {
         // No other platform supports Command.
         key = ui::VKEY_UNKNOWN;
         break;
       }
+    } else if (tokens[i] == values::kKeySearch) {
+      // Search is a special modifier only on ChromeOS and maps to 'Command'.
+      if (platform_key == values::kKeybindingPlatformChromeOs) {
+        modifiers |= ui::EF_COMMAND_DOWN;
+#if defined(OS_CHROMEOS)
+      } else if (platform_key == values::kKeybindingPlatformDefault) {
+        // Allow the search modifier here (similar to the treatment of command).
+        modifiers |= ui::EF_COMMAND_DOWN;
+#endif
+      } else {
+        // No other platform supports search.
+        key = ui::VKEY_UNKNOWN;
+        break;
+      }

[Finnur, 2014/08/21 11:18:10]

Is this copy-pasted from an old version of a CL I recently reviewed?

[David Tseng, 2014/08/21 16:17:56]

Acknowledged.

     } else if (tokens[i] == values::kKeyAlt) {
       modifiers |= ui::EF_ALT_DOWN;
     } else if (tokens[i] == values::kKeyShift) {
       modifiers |= ui::EF_SHIFT_DOWN;
     } else if (tokens[i].size() == 1 ||  // A-Z, 0-9.
                tokens[i] == values::kKeyComma ||
                tokens[i] == values::kKeyPeriod ||
                tokens[i] == values::kKeyUp ||
                tokens[i] == values::kKeyDown ||
                tokens[i] == values::kKeyLeft ||
@@ skipping 186 matching lines @@
 
   // Ctrl and Alt are mutually exclusive.
   if (accelerator.IsCtrlDown())
     shortcut += values::kKeyCtrl;
   else if (accelerator.IsAltDown())
     shortcut += values::kKeyAlt;
   if (!shortcut.empty())
     shortcut += values::kKeySeparator;
 
   if (accelerator.IsCmdDown()) {
+#if defined(OS_CHROMEOS)
+    shortcut += values::kKeySearch;
+#else
     shortcut += values::kKeyCommand;
+#endif

[Finnur, 2014/08/21 11:18:10]

Yeah, it seems like this CL could use a sync up with master...

[David Tseng, 2014/08/21 16:17:56]

Acknowledged.

     shortcut += values::kKeySeparator;
   }
 
   if (accelerator.IsShiftDown()) {
     shortcut += values::kKeyShift;
     shortcut += values::kKeySeparator;
   }
 
   if (accelerator.key_code() >= ui::VKEY_0 &&
       accelerator.key_code() <= ui::VKEY_9) {
@@ skipping 217 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