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

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

Issue 442333002: 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, 4 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 | « AUTHORS ('k') | 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 efbf1d427e47edd5b6e9071e8a3d9aff1f1d85c7..14b76f293e925b8c3b3a9055f566b16a20ef40e2 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.cc
+++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
@@ -765,8 +765,6 @@ 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:
@@ -778,6 +776,13 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) {
case XF86XK_Launch9:
return VKEY_F18;
+ // this was mapped to VKEY_F13 (see above), but this was causing odd
Wez 2014/08/06 21:17:53 nit: Capitalization.
+ // behavior (trig lock screen) with all keyboard that send this usage
+ // in order to launch the media player(supported on Windows, Android)
+ // (see crbug=398345)
Wez 2014/08/06 21:17:53 nit: Rather than describe the bug, describe the lo
mmeisser 2014/08/07 17:46:41 I will describe the mapping. This seems odd, but a
+ case XF86XK_Tools:
Wez 2014/08/06 21:17:53 Can you move this to the appropriate order in this
mmeisser 2014/08/07 17:46:41 The actual list of XK mappings are not really orde
+ return VKEY_MEDIA_LAUNCH_MEDIA_SELECT;
+
// For supporting multimedia buttons on a USB keyboard.
case XF86XK_Back:
return VKEY_BROWSER_BACK;
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698