|
@@ -10,7 +10,7 @@ This patch makes three changes to Accelerator::GetShortcutText to improve shortc
|
|
|
3. Ctrl-Shift-= should show as Ctrl-+
|
|
|
|
|
|
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
|
|
-index d7b79feb77f3595bcc8617b6e84c566357c336fe..3b1eab14a4348eab79f486aec43783fd8f629a8f 100644
|
|
|
+index 291bdeec97bec510f7c86a8e8bccab22b7d5d8ac..926a705c23bd5adbfc0fe178c44617086b946a80 100644
|
|
|
--- a/ui/base/accelerators/accelerator.cc
|
|
|
+++ b/ui/base/accelerators/accelerator.cc
|
|
|
@@ -11,6 +11,7 @@
|
|
@@ -29,9 +29,9 @@ index d7b79feb77f3595bcc8617b6e84c566357c336fe..3b1eab14a4348eab79f486aec43783fd
|
|
|
#include "ui/events/keycodes/keyboard_code_conversion.h"
|
|
|
-#endif
|
|
|
|
|
|
- namespace ui {
|
|
|
-
|
|
|
-@@ -154,7 +153,15 @@ base::string16 Accelerator::GetShortcutText() const {
|
|
|
+ #if defined(OS_CHROMEOS)
|
|
|
+ #include "ui/base/ui_base_features.h"
|
|
|
+@@ -220,7 +219,15 @@ base::string16 Accelerator::GetShortcutText() const {
|
|
|
shortcut = KeyCodeToName();
|
|
|
#endif
|
|
|
|
|
@@ -47,7 +47,7 @@ index d7b79feb77f3595bcc8617b6e84c566357c336fe..3b1eab14a4348eab79f486aec43783fd
|
|
|
#if defined(OS_WIN)
|
|
|
// Our fallback is to try translate the key code to a regular character
|
|
|
// unless it is one of digits (VK_0 to VK_9). Some keyboard
|
|
|
-@@ -163,21 +170,14 @@ base::string16 Accelerator::GetShortcutText() const {
|
|
|
+@@ -229,21 +236,14 @@ base::string16 Accelerator::GetShortcutText() const {
|
|
|
// 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;
|
|
@@ -75,7 +75,7 @@ index d7b79feb77f3595bcc8617b6e84c566357c336fe..3b1eab14a4348eab79f486aec43783fd
|
|
|
}
|
|
|
|
|
|
#if defined(OS_MACOSX)
|
|
|
-@@ -360,7 +360,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
|
|
|
+@@ -426,7 +426,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
|
|
|
// more information.
|
|
|
if (IsCtrlDown())
|
|
|
shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);
|