| Index: ui/base/accelerators/accelerator.cc
|
| ===================================================================
|
| --- ui/base/accelerators/accelerator.cc (revision 152319)
|
| +++ ui/base/accelerators/accelerator.cc (working copy)
|
| @@ -71,17 +71,21 @@
|
| }
|
|
|
| bool Accelerator::IsShiftDown() const {
|
| - return (modifiers_ & EF_SHIFT_DOWN) == EF_SHIFT_DOWN;
|
| + return (modifiers_ & EF_SHIFT_DOWN) != 0;
|
| }
|
|
|
| bool Accelerator::IsCtrlDown() const {
|
| - return (modifiers_ & EF_CONTROL_DOWN) == EF_CONTROL_DOWN;
|
| + return (modifiers_ & EF_CONTROL_DOWN) != 0;
|
| }
|
|
|
| bool Accelerator::IsAltDown() const {
|
| - return (modifiers_ & EF_ALT_DOWN) == EF_ALT_DOWN;
|
| + return (modifiers_ & EF_ALT_DOWN) != 0;
|
| }
|
|
|
| +bool Accelerator::IsCmdDown() const {
|
| + return (modifiers_ & EF_COMMAND_DOWN) != 0;
|
| +}
|
| +
|
| string16 Accelerator::GetShortcutText() const {
|
| int string_id = 0;
|
| switch(key_code_) {
|
| @@ -194,6 +198,9 @@
|
| 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.
|
|
|