| Index: ui/base/accelerators/accelerator.cc
|
| diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
| index 4bf3b37ddac017a50a1984d0792bd2d719ec6561..0113f8791fd5559a9ba3cfc34dcfedfac0a55c38 100644
|
| --- a/ui/base/accelerators/accelerator.cc
|
| +++ b/ui/base/accelerators/accelerator.cc
|
| @@ -197,7 +197,8 @@ base::string16 Accelerator::GetShortcutText() const {
|
| key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
|
| shortcut += key;
|
| #elif defined(USE_AURA) || defined(OS_MACOSX)
|
| - const uint16 c = GetCharacterFromKeyCode(key_code_, false);
|
| + DomCode code = KeyboardCodeToDomCode(key_code_);
|
| + const uint16 c = DomCodeToCharacter(code, false);
|
| if (c != 0)
|
| shortcut +=
|
| static_cast<base::string16::value_type>(base::ToUpperASCII(c));
|
|
|