Add support for Command key for Extension Commands

ui/base/accelerators/accelerator.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 "ui/base/accelerators/accelerator.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(TOOLKIT_GTK)
 #include <gdk/gdk.h>
@@ skipping 64 matching lines @@
 }
 
 bool Accelerator::IsCtrlDown() const {
   return (modifiers_ & EF_CONTROL_DOWN) == EF_CONTROL_DOWN;
 }
 
 bool Accelerator::IsAltDown() const {
   return (modifiers_ & EF_ALT_DOWN) == EF_ALT_DOWN;
 }
 
+bool Accelerator::IsCmdDown() const {
+  return (modifiers_ & EF_COMMAND_DOWN) == EF_COMMAND_DOWN;

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

nit: if you say `!= 0` instead of `== EF_COMMAND_DOWN`, you don't have to repeat
yourself, and you're less likely to make a copy-paste error later.

+}
+
 string16 Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
     case ui::VKEY_TAB:
       string_id = IDS_APP_TAB_KEY;
       break;
     case ui::VKEY_RETURN:
       string_id = IDS_APP_ENTER_KEY;
       break;
     case ui::VKEY_ESCAPE:
@@ skipping 92 matching lines @@
     shortcut = l10n_util::GetStringFUTF16(IDS_APP_SHIFT_MODIFIER, shortcut);
 
   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
   // See http://blogs.msdn.com/oldnewthing/archive/2004/03/29/101121.aspx for
   // more information.
   if (IsCtrlDown())
     shortcut = l10n_util::GetStringFUTF16(IDS_APP_CONTROL_MODIFIER, shortcut);
   else if (IsAltDown())
     shortcut = l10n_util::GetStringFUTF16(IDS_APP_ALT_MODIFIER, shortcut);
 
+  if (IsCmdDown())
+    shortcut = l10n_util::GetStringFUTF16(IDS_APP_COMMAND_MODIFIER, shortcut);
+
   // For some reason, menus in Windows ignore standard Unicode directionality
   // marks (such as LRE, PDF, etc.). On RTL locales, we use RTL menus and
   // therefore any text we draw for the menu items is drawn in an RTL context.
   // Thus, the text "Ctrl++" (which we currently use for the Zoom In option)
   // appears as "++Ctrl" in RTL because the Unicode BiDi algorithm puts
   // punctuations on the left when the context is right-to-left. Shortcuts that
   // do not end with a punctuation mark (such as "Ctrl+H" do not have this
   // problem).
   //
   // The only way to solve this problem is to adjust the string if the locale
@@ skipping 14 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace ui