diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:03:31 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 20:03:31 +0000 |
| commit | ef6b8ae9ef20cb7f0d88d66b515f7beb40197e0e (patch) | |
| tree | ccf12fb265b856028c78bc6851ea4e1e3cc7c283 /ui | |
| parent | 59cc1e9138c476c8ba80857cb03ef6dd769475ff (diff) | |
| download | chromium_src-ef6b8ae9ef20cb7f0d88d66b515f7beb40197e0e.zip chromium_src-ef6b8ae9ef20cb7f0d88d66b515f7beb40197e0e.tar.gz chromium_src-ef6b8ae9ef20cb7f0d88d66b515f7beb40197e0e.tar.bz2 | |
Implement Accelerator::GetShortcutText for non-Windows Aura.
BUG=103986
TEST=Checked all the accelerator text shown in the menu equal to the ones on non-Aura Chrome OS.
Review URL: http://codereview.chromium.org/8773003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/accelerators/accelerator.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc index 74d9f03..bd5d9e5 100644 --- a/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc @@ -17,6 +17,10 @@ #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 { @@ -83,6 +87,11 @@ string16 Accelerator::GetShortcutText() const { 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_) { |