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 6e8af8acd1e2df058bf7f9f94186794a505e7bbf..aecee1dba3d7eabd6cf278fab8847d027b18cb96 100644 |
--- a/ui/base/keycodes/keyboard_code_conversion_x.cc |
+++ b/ui/base/keycodes/keyboard_code_conversion_x.cc |
@@ -365,18 +365,29 @@ KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym) { |
return VKEY_VOLUME_DOWN; |
case XF86XK_AudioRaiseVolume: |
return VKEY_VOLUME_UP; |
+ case XF86XK_AudioNext: |
+ return VKEY_MEDIA_NEXT_TRACK; |
+ case XF86XK_AudioPrev: |
+ return VKEY_MEDIA_PREV_TRACK; |
case XF86XK_AudioStop: |
return VKEY_MEDIA_STOP; |
case XF86XK_AudioPlay: |
return VKEY_MEDIA_PLAY_PAUSE; |
case XF86XK_Mail: |
return VKEY_MEDIA_LAUNCH_MAIL; |
+ case XF86XK_LaunchA: // F3 on an Apple keyboard. |
+ return VKEY_MEDIA_LAUNCH_APP1; |
+ case XF86XK_LaunchB: // F4 on an Apple keyboard. |
case XF86XK_Calculator: |
return VKEY_MEDIA_LAUNCH_APP2; |
case XF86XK_MonBrightnessDown: |
return VKEY_BRIGHTNESS_DOWN; |
case XF86XK_MonBrightnessUp: |
return VKEY_BRIGHTNESS_UP; |
+ case XF86XK_KbdBrightnessDown: |
+ return VKEY_KBD_BRIGHTNESS_DOWN; |
+ case XF86XK_KbdBrightnessUp: |
+ return VKEY_KBD_BRIGHTNESS_UP; |
// TODO(sad): some keycodes are still missing. |
} |
@@ -709,18 +720,28 @@ int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift) { |
return XF86XK_AudioLowerVolume; |
case VKEY_VOLUME_UP: |
return XF86XK_AudioRaiseVolume; |
+ case VKEY_MEDIA_NEXT_TRACK: |
Yusuke Sato
2012/07/10 20:43:52
also added code for reverse conversion for consist
|
+ return XF86XK_AudioNext; |
+ case VKEY_MEDIA_PREV_TRACK: |
+ return XF86XK_AudioPrev; |
case VKEY_MEDIA_STOP: |
return XF86XK_AudioStop; |
case VKEY_MEDIA_PLAY_PAUSE: |
return XF86XK_AudioPlay; |
case VKEY_MEDIA_LAUNCH_MAIL: |
return XF86XK_Mail; |
+ case VKEY_MEDIA_LAUNCH_APP1: |
+ return XF86XK_LaunchA; |
case VKEY_MEDIA_LAUNCH_APP2: |
- return XF86XK_Calculator; |
+ return XF86XK_LaunchB; |
case VKEY_BRIGHTNESS_DOWN: |
return XF86XK_MonBrightnessDown; |
case VKEY_BRIGHTNESS_UP: |
return XF86XK_MonBrightnessUp; |
+ case VKEY_KBD_BRIGHTNESS_DOWN: |
+ return XF86XK_KbdBrightnessDown; |
+ case VKEY_KBD_BRIGHTNESS_UP: |
+ return XF86XK_KbdBrightnessUp; |
default: |
LOG(WARNING) << "Unknown keycode:" << keycode; |