Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: ui/base/keycodes/keyboard_code_conversion_x.cc

Issue 9241002: Do not map XK_Meta_L/R to VKEY_L/RWIN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/keycodes/keyboard_code_conversion_x.cc
diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index ee6fe9e18360368284a1a05bb3e0668457c77ec1..bfaa569bfd72377020ed7d623c352905ef27023b 100644
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc
@@ -289,10 +289,8 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
return VKEY_INSERT;
case XK_Help:
return VKEY_HELP;
- case XK_Meta_L:
case XK_Super_L:
return VKEY_LWIN;
- case XK_Meta_R:
case XK_Super_R:
return VKEY_RWIN;
case XK_Menu:
@@ -588,9 +586,9 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) {
return (shift ? XK_A : XK_a) + (keycode - VKEY_A);
case VKEY_LWIN:
- return XK_Meta_L;
+ return XK_Super_L;
case VKEY_RWIN:
- return XK_Meta_R;
+ return XK_Super_R;
case VKEY_NUMLOCK:
return XK_Num_Lock;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698