Do not ignore F3-F7 and F9 key presses on an Apple keyboard.

BUG=123739
TEST=try


Review URL: https://chromiumcodereview.appspot.com/10696161

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146131 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 26 insertions, 3 deletions

diff --git a/ui/base/keycodes/keyboard_code_conversion_x.cc b/ui/base/keycodes/keyboard_code_conversion_x.cc
index 6e8af8a..aecee1d 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:
+      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;
diff --git a/ui/base/keycodes/keyboard_codes_posix.h b/ui/base/keycodes/keyboard_codes_posix.h
index e7f679d..a2943e7 100644
--- a/ui/base/keycodes/keyboard_codes_posix.h
+++ b/ui/base/keycodes/keyboard_codes_posix.h
@@ -207,10 +207,12 @@ enum KeyboardCode {
   VKEY_OEM_CLEAR = 0xFE,
   VKEY_UNKNOWN = 0,
 
-  // POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0xD8-DA are
+  // POSIX specific VKEYs. Note that as of Windows SDK 7.1, 0xD8-DA and 0xE8 are
   // unassigned.
   VKEY_BRIGHTNESS_DOWN = 0xD8,
-  VKEY_BRIGHTNESS_UP = 0xD9
+  VKEY_BRIGHTNESS_UP = 0xD9,
+  VKEY_KBD_BRIGHTNESS_DOWN = 0xDA,
+  VKEY_KBD_BRIGHTNESS_UP = 0xE8
 };
 
 }  // namespace ui