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

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

Issue 643243002: Revert "Fixed odd behavior for keyboards using the AL_CONSUMER_CONTROL_CONFIG" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/events/keycodes/keyboard_code_conversion_x.cc
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
index ce8da153b74ffcc3daa2ef57fb213371da1505b0..a4a810e23a43004eb09af168daa797968e6d8a23 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -780,6 +780,8 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
// https://bugs.freedesktop.org/show_bug.cgi?id=5783
// In Chrome, we map these X key symbols back to F13-18 since we don't have
// VKEYs for these XF86XK symbols.
+ case XF86XK_Tools:
+ return VKEY_F13;
case XF86XK_Launch5:
return VKEY_F14;
case XF86XK_Launch6:
@@ -827,13 +829,6 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XF86XK_LaunchB: // F4 on an Apple keyboard.
case XF86XK_Calculator:
return VKEY_MEDIA_LAUNCH_APP2;
-
- // XF86XK_Tools is generated from HID Usage AL_CONSUMER_CONTROL_CONFIG
- // (Usage 0x0183, Page 0x0C) and most commonly launches the OS default
- // media player (see crbug.com/398345).
- case XF86XK_Tools:
- return VKEY_MEDIA_LAUNCH_MEDIA_SELECT;
-
case XF86XK_WLAN:
return VKEY_WLAN;
case XF86XK_PowerOff:
« 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