Implement Accelerator::GetShortcutText for non-Windows Aura.

ui/base/accelerators/accelerator.cc

 // Copyright (c) 2011 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_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(OS_WIN) && defined(USE_AURA)
+#include "ui/base/keycodes/keyboard_code_conversion.h"
+#endif
+
 namespace ui {
 
 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;
@@ skipping 46 matching lines @@
     // layouts have characters other than digits assigned in
     // an unshifted mode (e.g. French AZERY layout has 'a with grave
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
     if (key_code_ >= '0' && key_code_ <= '9')
       key = key_code_;
     else
       key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
     shortcut += key;
+#elif defined(USE_AURA)
+    const uint16 c = GetCharacterFromKeyCode(key_code_, false);
+    if (c != 0) {
+      shortcut += static_cast<string16::value_type>(base::ToUpperASCII(c));
+    }
 #elif defined(TOOLKIT_USES_GTK)
     const gchar* name = NULL;
     switch (key_code_) {
       case ui::VKEY_OEM_2:
         name = static_cast<const gchar*>("/");
         break;
       default:
         name = gdk_keyval_name(gdk_keyval_to_lower(key_code_));
         break;
     }
@@ skipping 58 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