Add support for Command key for Extension Commands

chrome/browser/resources/extensions/extension_command_list.js

 // 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.
 
 cr.define('options', function() {
   'use strict';
 
   /**
    * Creates a new list of extension commands.
    * @param {Object=} opt_propertyBag Optional properties.
@@ skipping 15 matching lines @@
   }
 
   /**
    * Convert a keystroke event to string form, while taking into account
    * (ignoring) invalid extension commands.
    * @param {Event} event The keyboard event to convert.
    * @return {string} The keystroke as a string.
    */
   function keystrokeToString(event) {
     var output = '';
+    if (cr.isMac && event.metaKey)

[Nico, 2012/08/22 14:30:49]

Do you need the cr.isMac here?

+      output = 'Command+';
     if (event.ctrlKey)
       output = 'Ctrl+';
     if (!event.ctrlKey && event.altKey)
       output += 'Alt+';
     if (event.shiftKey)
       output += 'Shift+';
     if (validChar(event.keyCode))
       output += String.fromCharCode('A'.charCodeAt(0) + event.keyCode - 65);
     return output;
   }
@@ skipping 179 matching lines @@
      * @param {Event} event The keyboard event to consider.
      * @private
      */
     handleKey_: function(event) {
       // While capturing, we prevent all events from bubbling, to prevent
       // shortcuts lacking the right modifier (F3 for example) from activating
       // and ending capture prematurely.
       event.preventDefault();
       event.stopPropagation();
 
-      if (!event.ctrlKey && !event.altKey)
-        return;  // Ctrl or Alt is a must.
+      if (!event.ctrlKey && !event.altKey && (!cr.isMac || !event.metaKey))
+        return;  // Ctrl or Alt is a must (or Cmd on Mac).
 
       var keystroke = keystrokeToString(event);
       event.target.textContent = keystroke;
       event.target.classList.add('contains-chars');
 
       if (validChar(event.keyCode)) {
         var node = event.target;
         while (node && !node.id)
           node = node.parentElement;
         // The id is set to namespacePrefix-extensionId-commandName. We don't
         // care about the namespacePrefix (but we care about the other two).
         var id = node.id.substring(8, 40);
         var command_name = node.id.substring(41);
 
         this.oldValue_ = keystroke;  // Forget what the old value was.
         chrome.send('setExtensionCommandShortcut',
                     [id, command_name, keystroke]);
         this.endCapture_(event);
       }
 
       this.currentKeyEvent_ = event;
     },
   };
 
   return {
     ExtensionCommandList: ExtensionCommandList
   };
 });