Port Extension Commands to Mac.

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/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/values.h"
@@ skipping 35 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] == "Ctrl") {
       modifiers |= ui::EF_CONTROL_DOWN;
-    } else if (tokens[i] == "Alt") {
+    } else if (tokens[i] == "Alt" ||
+               (tokens[i] == "Option" && platform_key == "mac")) {
       modifiers |= ui::EF_ALT_DOWN;
     } else if (tokens[i] == "Shift") {
       modifiers |= ui::EF_SHIFT_DOWN;
     } else if (tokens[i] == "Command" && platform_key == "mac") {
-      // TODO(finnur): Implement for Mac.
-      // TODO(finnur): Reject Shift modifier if no Cmd/Opt (see below).
-    } else if (tokens[i] == "Option" && platform_key == "mac") {
-      // TODO(finnur): Implement for Mac.
+      modifiers |= ui::EF_COMMAND_DOWN;
     } else if (tokens[i].size() == 1) {
       if (key != ui::VKEY_UNKNOWN) {
         // Multiple key assignments.
         key = ui::VKEY_UNKNOWN;
         break;
       }
       if (tokens[i][0] >= 'A' && tokens[i][0] <= 'Z') {
         key = static_cast<ui::KeyboardCode>(ui::VKEY_A + (tokens[i][0] - 'A'));
       } else if (tokens[i][0] >= '0' && tokens[i][0] <= '9') {
         key = static_cast<ui::KeyboardCode>(ui::VKEY_0 + (tokens[i][0] - '0'));
       } else {
         key = ui::VKEY_UNKNOWN;
         break;
       }
     } else {
       *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidKeyBinding,
           base::IntToString(index),
           platform_key,
           accelerator);
       return ui::Accelerator();
     }
   }
+  bool command = (modifiers & ui::EF_COMMAND_DOWN) != 0;
   bool ctrl = (modifiers & ui::EF_CONTROL_DOWN) != 0;
   bool alt = (modifiers & ui::EF_ALT_DOWN) != 0;
   bool shift = (modifiers & ui::EF_SHIFT_DOWN) != 0;
+
   // We support Ctrl+foo, Alt+foo, Ctrl+Shift+foo, Alt+Shift+foo, but not
   // Ctrl+Alt+foo and not Shift+foo either. For a more detailed reason why we
   // don't support Ctrl+Alt+foo see this article:
   // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/29/101121.aspx.
+  // On Mac Command can also be used in combination with Shift or on its own,
+  // as a modifier.
   if (key == ui::VKEY_UNKNOWN || (ctrl && alt) ||
-      ((platform_key != "mac") && shift && !ctrl && !alt)) {
+      (shift && !ctrl && !alt && !command)) {
     *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidKeyBinding,
         base::IntToString(index),
         platform_key,
         accelerator);
     return ui::Accelerator();
   }
 
   return ui::Accelerator(key, modifiers);
 }
@@ skipping 158 matching lines @@
   extension_data->SetString("description", command_description);
   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());
 
   return extension_data;
 }
 
 }  // namespace extensions