| Index: ui/base/accelerators/accelerator.cc
|
| diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
| index a05e18534136e16094370224baf12cd7a8d8f6fc..bda48b3a2697b32becad07fa587a9b5da5aa7a57 100644
|
| --- a/ui/base/accelerators/accelerator.cc
|
| +++ b/ui/base/accelerators/accelerator.cc
|
| @@ -212,7 +212,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);
|
| + const uint16 c = DomCodeToUsLayoutCharacter(
|
| + UsLayoutKeyboardCodeToDomCode(key_code_), false);
|
| if (c != 0)
|
| shortcut +=
|
| static_cast<base::string16::value_type>(base::ToUpperASCII(c));
|
|
|