Fix Windows and Linux scan codes.

Some Windows scan code values in the table followed the mistaken
assumption that Windows Set 1 codes matched IBM Set 1 codes outside
the basic 101-key set. This corrects those values and adds others
following MS documentation.

Some Linux (evdev / xkb) scan code values were also missing or
arguably incorrect (and diverged from Firefox on Linux), and have
been added or amended.

BUG=542589,542577

Review URL: https://codereview.chromium.org/1395183005

Cr-Commit-Position: refs/heads/master@{#355776}

2 files changed, 123 insertions, 61 deletions

diff --git a/ui/events/keycodes/dom/keycode_converter_data.inc b/ui/events/keycodes/dom/keycode_converter_data.inc
index cfe10fb..a63d917 100644
--- a/ui/events/keycodes/dom/keycode_converter_data.inc
+++ b/ui/events/keycodes/dom/keycode_converter_data.inc
@@ -13,6 +13,68 @@
 //      http://www.w3.org/TR/DOM-Level-3-Events-code/
 //  [2] OS X <HIToolbox/Events.h>
 //  [3] Linux <linux/input.h> and hid-input.c
+//  [4] USB HID to PS/2 Scan Code Translation Table
+//      http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/translate.pdf
+//  [5] Keyboard Scan Code Specification
+//      http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc
+
+// General notes:
+//
+//  This table provides the definition of ui::DomCode (UI Events |code|) values
+//  as well as mapping between scan codes and DomCode. Some entries have no
+//  defined scan codes; these are present only to allow those UI Events |code|
+//  strings to be represented by DomCode. A few have a null code; these define
+//  mappings with a DomCode:: value but no |code| string, typically because
+//  they end up used in shortcuts but not standardized in UI Events; e.g.
+//  DomCode::BRIGHTNESS_UP. Commented-out entries document USB codes that are
+//  potentially interesting but not currently used.
+
+// Linux notes:
+//
+//  All USB codes that are listed here and that are supported by the kernel
+//  (as of 4.2) have their evdev/xkb scan codes recorded; if an evdev/xkb
+//  code is 0, it is because the kernel USB driver does not handle that key.
+//
+//  Some Linux kernel mappings for USB keys may seem counterintuitive:
+//
+//  [L1] Although evdev 0x163 KEY_CLEAR exists, Linux does not use it
+//       for any USB keys. Linux maps USB 0x07009c [Keyboard Clear] and
+//       0x0700d8 [Keypad Clear] to KEY_DELETE "Delete", so those codes are
+//       not distinguishable by applications, and UI Events "NumpadClear"
+//       is therefore not supported. USB 0x0700A2 [Keyboard Clear/Again]
+//       is not mapped by the kernel at all.
+//
+//  [L2] 'Menu' and 'Props' naming differs between evdev and USB / UI Events.
+//        USB 0x010085 [System Main Menu] and USB 0x0C0040 [Menu Mode] both
+//        map to evdev 0x8B KEY_MENU (which has no corresponding UI Events
+//        |code|). USB 0x070076 [Keyboard Menu] does not map to KEY_MENU;
+//        it maps to evdev 0x82 KEY_PROPS, which is not the same as USB and
+//        UI Events "Props". USB 0x0700A3 [Props], which does correspond to
+//        UI Events "Props", is not mapped by the kernel. (And all of these
+//        are distinct from UI Events' "ContextMenu", which corresponds to
+//        USB 0x070065 [Keyboard Application] via evdev 0x7F KEY_COMPOSE,
+//        following Windows convention.)
+
+// Windows notes:
+//
+//  The set of scan codes supported here may not be complete.
+//
+//  [W1] Windows maps both USB 0x070094 [Lang5] and USB 0x070073 [F24] to the
+//       same scan code, 0x76. (Microsoft's defined scan codes for F13 - F24
+//       appear to be the result of accidentally mapping an IBM Set 3 terminal
+//       keyboard, rather than an IBM Set 2 PC keyboard, through the BIOS
+//       2-to-1 table.)  We map 0x76 to F24 here, since Lang5 appears unused
+//       in practice (its declared function, Zenkaku/Hankaku switch, is
+//       conventionally placed on Backquote by Japanese keyboards).
+
+// Macintosh notes:
+//
+//  The set of scan codes supported here may not be complete.
+//
+//  [M1] OS X maps USB 0x070049 [Insert] as well as USB 0x070075 [Help] to
+//       scan code 0x72 kVK_Help. We map this to UI Events 'Insert', since
+//       Apple keyboards with USB 0x070049 [Insert] labelled "Help" have not
+//       been made since 2007.
 
 USB_KEYMAP_DECLARATION {
 
@@ -40,8 +102,8 @@ USB_KEYMAP_DECLARATION {
   // Sleep could be encoded as USB#0c0032, but there's no corresponding WakeUp
   // in the 0x0c USB page.
   //            USB     evdev    XKB     Win     Mac
-  USB_KEYMAP(0x010082, 0x008e, 0x0096, 0x0000, 0xffff, "Sleep", SLEEP), // SystemSleep
-  USB_KEYMAP(0x010083, 0x008f, 0x0097, 0x0000, 0xffff, "WakeUp", WAKE_UP),
+  USB_KEYMAP(0x010082, 0x008e, 0x0096, 0xe05f, 0xffff, "Sleep", SLEEP), // SystemSleep
+  USB_KEYMAP(0x010083, 0x008f, 0x0097, 0xe063, 0xffff, "WakeUp", WAKE_UP),
 
   // =========================================
   // USB Usage Page 0x07: Keyboard/Keypad Page
@@ -59,8 +121,8 @@ USB_KEYMAP_DECLARATION {
 
   //            USB     evdev    XKB     Win     Mac
   USB_KEYMAP(0x070000, 0x0000, 0x0000, 0x0000, 0xffff, NULL, USB_RESERVED),
-  USB_KEYMAP(0x070001, 0x0000, 0x0000, 0x0000, 0xffff, NULL, USB_ERROR_ROLL_OVER),
-  USB_KEYMAP(0x070002, 0x0000, 0x0000, 0x0000, 0xffff, NULL, USB_POST_FAIL),
+  USB_KEYMAP(0x070001, 0x0000, 0x0000, 0x00ff, 0xffff, NULL, USB_ERROR_ROLL_OVER),
+  USB_KEYMAP(0x070002, 0x0000, 0x0000, 0x00fc, 0xffff, NULL, USB_POST_FAIL),
   USB_KEYMAP(0x070003, 0x0000, 0x0000, 0x0000, 0xffff, NULL, USB_ERROR_UNDEFINED),
   USB_KEYMAP(0x070004, 0x001e, 0x0026, 0x001e, 0x0000, "KeyA", KEY_A), // aA
   USB_KEYMAP(0x070005, 0x0030, 0x0038, 0x0030, 0x000b, "KeyB", KEY_B), // bB
@@ -149,7 +211,7 @@ USB_KEYMAP_DECLARATION {
   USB_KEYMAP(0x070047, 0x0046, 0x004e, 0x0046, 0xffff, "ScrollLock", SCROLL_LOCK),
 
   USB_KEYMAP(0x070048, 0x0077, 0x007f, 0x0045, 0xffff, "Pause", PAUSE),
-  // Labeled "Help/Insert" on Mac.
+  // USB#0x070049 Insert, labeled "Help/Insert" on Mac -- see note M1 at top.
   USB_KEYMAP(0x070049, 0x006e, 0x0076, 0xe052, 0x0072, "Insert", INSERT),
   USB_KEYMAP(0x07004a, 0x0066, 0x006e, 0xe047, 0x0073, "Home", HOME),
   USB_KEYMAP(0x07004b, 0x0068, 0x0070, 0xe049, 0x0074, "PageUp", PAGE_UP),
@@ -189,30 +251,33 @@ USB_KEYMAP_DECLARATION {
   // The keycap varies on international keyboards:
   //   Dan: <> Dutch: ][ Ger: <> UK: \|
   USB_KEYMAP(0x070064, 0x0056, 0x005e, 0x0056, 0x000a, "IntlBackslash", INTL_BACKSLASH),
-  // AppMenu (next to RWin key)
+  // USB#0x070065 Application Menu (next to RWin key) -- see note L2 at top.
   USB_KEYMAP(0x070065, 0x007f, 0x0087, 0xe05d, 0x006e, "ContextMenu", CONTEXT_MENU),
-  USB_KEYMAP(0x070066, 0x0074, 0x007c, 0x0000, 0xffff, "Power", POWER),
-  USB_KEYMAP(0x070067, 0x0075, 0x007d, 0x0000, 0x0051, "NumpadEqual", NUMPAD_EQUAL),
-
-  USB_KEYMAP(0x070068, 0x00b7, 0x00bf, 0x005b, 0x0069, "F13", F13),
-  USB_KEYMAP(0x070069, 0x00b8, 0x00c0, 0x005c, 0x006b, "F14", F14),
-  USB_KEYMAP(0x07006a, 0x00b9, 0x00c1, 0x005d, 0x0071, "F15", F15),
-  USB_KEYMAP(0x07006b, 0x00ba, 0x00c2, 0x0063, 0x006a, "F16", F16),
-  USB_KEYMAP(0x07006c, 0x00bb, 0x00c3, 0x0064, 0x0040, "F17", F17),
-  USB_KEYMAP(0x07006d, 0x00bc, 0x00c4, 0x0065, 0x004f, "F18", F18),
-  USB_KEYMAP(0x07006e, 0x00bd, 0x00c5, 0x0066, 0x0050, "F19", F19),
-  USB_KEYMAP(0x07006f, 0x00be, 0x00c6, 0x0067, 0x005a, "F20", F20),
-
-  USB_KEYMAP(0x070070, 0x00bf, 0x00c7, 0x0068, 0xffff, "F21", F21),
-  USB_KEYMAP(0x070071, 0x00c0, 0x00c8, 0x0069, 0xffff, "F22", F22),
-  USB_KEYMAP(0x070072, 0x00c1, 0x00c9, 0x006a, 0xffff, "F23", F23),
-  USB_KEYMAP(0x070073, 0x00c2, 0x00ca, 0x006b, 0xffff, "F24", F24),
-  USB_KEYMAP(0x070074, 0x0000, 0x0000, 0x0000, 0xffff, "Open", OPEN), // Execute
+  USB_KEYMAP(0x070066, 0x0074, 0x007c, 0xe05e, 0xffff, "Power", POWER),
+  USB_KEYMAP(0x070067, 0x0075, 0x007d, 0x0059, 0x0051, "NumpadEqual", NUMPAD_EQUAL),
+
+  USB_KEYMAP(0x070068, 0x00b7, 0x00bf, 0x0064, 0x0069, "F13", F13),
+  USB_KEYMAP(0x070069, 0x00b8, 0x00c0, 0x0065, 0x006b, "F14", F14),
+  USB_KEYMAP(0x07006a, 0x00b9, 0x00c1, 0x0066, 0x0071, "F15", F15),
+  USB_KEYMAP(0x07006b, 0x00ba, 0x00c2, 0x0067, 0x006a, "F16", F16),
+  USB_KEYMAP(0x07006c, 0x00bb, 0x00c3, 0x0068, 0x0040, "F17", F17),
+  USB_KEYMAP(0x07006d, 0x00bc, 0x00c4, 0x0069, 0x004f, "F18", F18),
+  USB_KEYMAP(0x07006e, 0x00bd, 0x00c5, 0x006a, 0x0050, "F19", F19),
+  USB_KEYMAP(0x07006f, 0x00be, 0x00c6, 0x006b, 0x005a, "F20", F20),
+
+  USB_KEYMAP(0x070070, 0x00bf, 0x00c7, 0x006c, 0xffff, "F21", F21),
+  USB_KEYMAP(0x070071, 0x00c0, 0x00c8, 0x006d, 0xffff, "F22", F22),
+  USB_KEYMAP(0x070072, 0x00c1, 0x00c9, 0x006e, 0xffff, "F23", F23),
+  // USB#0x070073 -- see note W1 at top.
+  USB_KEYMAP(0x070073, 0x00c2, 0x00ca, 0x0076, 0xffff, "F24", F24),
+  USB_KEYMAP(0x070074, 0x0086, 0x008e, 0x0000, 0xffff, "Open", OPEN), // Execute
+  // USB#0x070075 Help -- see note M1 at top.
   USB_KEYMAP(0x070075, 0x008a, 0x0092, 0xe03b, 0xffff, "Help", HELP),
-  USB_KEYMAP(0x070076, 0x008b, 0x0093, 0x0000, 0xffff, NULL, MENU), // Menu
-  USB_KEYMAP(0x070077, 0x0000, 0x0000, 0x0000, 0xffff, "Select", SELECT), // Select
+  // USB#0x070076 Keyboard Menu -- see note L2 at top.
+  //USB_KEYMAP(0x070076, 0x0000, 0x0000, 0x0000, 0xffff, NULL, MENU), // Menu
+  USB_KEYMAP(0x070077, 0x0084, 0x008c, 0x0000, 0xffff, "Select", SELECT), // Select
 
-  //USB_KEYMAP(0x070078, 0x0000, 0x0000, 0x0000, 0xffff, NULL, STOP), // Stop
+  //USB_KEYMAP(0x070078, 0x0080, 0x0088, 0x0000, 0xffff, NULL, STOP), // Stop
   USB_KEYMAP(0x070079, 0x0081, 0x0089, 0x0000, 0xffff, "Again", AGAIN), // Again
   USB_KEYMAP(0x07007a, 0x0083, 0x008b, 0xe008, 0xffff, "Undo", UNDO),
   USB_KEYMAP(0x07007b, 0x0089, 0x0091, 0xe017, 0xffff, "Cut", CUT),
@@ -226,45 +291,46 @@ USB_KEYMAP_DECLARATION {
   //USB_KEYMAP(0x070082, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LOCKING_CAPS_LOCK),
   //USB_KEYMAP(0x070083, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LOCKING_NUM_LOCK),
   //USB_KEYMAP(0x070084, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LOCKING_SCROLL_LOCK),
-  USB_KEYMAP(0x070085, 0x0079, 0x0081, 0x0000, 0x005f, "NumpadComma", NUMPAD_COMMA),
+  USB_KEYMAP(0x070085, 0x0079, 0x0081, 0x007e, 0x005f, "NumpadComma", NUMPAD_COMMA),
 
   // International1
   // USB#070086 is used on AS/400 keyboards. Standard Keypad_= is USB#070067.
   //USB_KEYMAP(0x070086, 0x0000, 0x0000, 0x0000, 0xffff, NULL, NUMPAD_EQUAL),
   // USB#070087 is used for Brazilian /? and Japanese _ 'ro'.
-  USB_KEYMAP(0x070087, 0x0059, 0x0061, 0x0000, 0x005e, "IntlRo", INTL_RO),
+  USB_KEYMAP(0x070087, 0x0059, 0x0061, 0x0073, 0x005e, "IntlRo", INTL_RO),
   // International2
   // USB#070088 is used as Japanese Hiragana/Katakana key.
-  USB_KEYMAP(0x070088, 0x005d, 0x0065, 0x0000, 0x0068, "KanaMode", KANA_MODE),
+  USB_KEYMAP(0x070088, 0x005d, 0x0065, 0x0070, 0x0068, "KanaMode", KANA_MODE),
   // International3
   // USB#070089 is used as Japanese Yen key.
   USB_KEYMAP(0x070089, 0x007c, 0x0084, 0x007d, 0x005d, "IntlYen", INTL_YEN),
   // International4
   // USB#07008a is used as Japanese Henkan (Convert) key.
-  USB_KEYMAP(0x07008a, 0x005c, 0x0064, 0x0000, 0xffff, "Convert", CONVERT),
+  USB_KEYMAP(0x07008a, 0x005c, 0x0064, 0x0079, 0xffff, "Convert", CONVERT),
   // International5
   // USB#07008b is used as Japanese Muhenkan (No-convert) key.
-  USB_KEYMAP(0x07008b, 0x005e, 0x0066, 0x0000, 0xffff, "NonConvert", NON_CONVERT),
-  //USB_KEYMAP(0x07008c, 0x0000, 0x0000, 0x0000, 0xffff, NULL, INTERNATIONAL6),
+  USB_KEYMAP(0x07008b, 0x005e, 0x0066, 0x007b, 0xffff, "NonConvert", NON_CONVERT),
+  //USB_KEYMAP(0x07008c, 0x005f, 0x0067, 0x005c, 0xffff, NULL, INTERNATIONAL6),
   //USB_KEYMAP(0x07008d, 0x0000, 0x0000, 0x0000, 0xffff, NULL, INTERNATIONAL7),
   //USB_KEYMAP(0x07008e, 0x0000, 0x0000, 0x0000, 0xffff, NULL, INTERNATIONAL8),
   //USB_KEYMAP(0x07008f, 0x0000, 0x0000, 0x0000, 0xffff, NULL, INTERNATIONAL9),
 
   // LANG1
   // USB#070090 is used as Korean Hangul/English toggle key.
-  USB_KEYMAP(0x070090, 0x007a, 0x0082, 0x0000, 0xffff, "Lang1", LANG1),
+  USB_KEYMAP(0x070090, 0x007a, 0x0082, 0x0072, 0xffff, "Lang1", LANG1),
   // LANG2
   // USB#070091 is used as Korean Hanja conversion key.
-  USB_KEYMAP(0x070091, 0x007b, 0x0083, 0x0000, 0xffff, "Lang2", LANG2),
+  USB_KEYMAP(0x070091, 0x007b, 0x0083, 0x0071, 0xffff, "Lang2", LANG2),
   // LANG3
   // USB#070092 is used as Japanese Katakana key.
-  USB_KEYMAP(0x070092, 0x005a, 0x0062, 0x0000, 0xffff, "Lang3", LANG3),
+  USB_KEYMAP(0x070092, 0x005a, 0x0062, 0x0078, 0xffff, "Lang3", LANG3),
   // LANG4
   // USB#070093 is used as Japanese Hiragana key.
-  USB_KEYMAP(0x070093, 0x005b, 0x0063, 0x0000, 0xffff, "Lang4", LANG4),
+  USB_KEYMAP(0x070093, 0x005b, 0x0063, 0x0077, 0xffff, "Lang4", LANG4),
   // LANG5
   // USB#070094 is used as Japanese Zenkaku/Hankaku (Fullwidth/halfwidth) key.
-  USB_KEYMAP(0x070094, 0x0000, 0x0000, 0x0000, 0xffff, "Lang5", LANG5),
+  // Not mapped on Windows -- see note W1 at top.
+  USB_KEYMAP(0x070094, 0x0055, 0x005d, 0x0000, 0xffff, "Lang5", LANG5),
   //USB_KEYMAP(0x070095, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LANG6), // LANG6
   //USB_KEYMAP(0x070096, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LANG7), // LANG7
   //USB_KEYMAP(0x070097, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LANG8), // LANG8
@@ -272,7 +338,8 @@ USB_KEYMAP_DECLARATION {
 
   //USB_KEYMAP(0x070099, 0x0000, 0x0000, 0x0000, 0xffff, NULL, ALTERNATE_ERASE),
   //USB_KEYMAP(0x07009a, 0x0000, 0x0000, 0x0000, 0xffff, NULL, SYS_REQ), // /Attention
-  USB_KEYMAP(0x07009b, 0x0080, 0x0088, 0x0000, 0xffff, "Abort", ABORT), // Cancel
+  USB_KEYMAP(0x07009b, 0x0000, 0x0000, 0x0000, 0xffff, "Abort", ABORT), // Cancel
+  // USB#0x07009c Keyboard Clear -- see note L1 at top.
   //USB_KEYMAP(0x07009c, 0x0000, 0x0000, 0x0000, 0xffff, NULL, CLEAR), // Clear
   //USB_KEYMAP(0x07009d, 0x0000, 0x0000, 0x0000, 0xffff, NULL, PRIOR), // Prior
   //USB_KEYMAP(0x07009e, 0x0000, 0x0000, 0x0000, 0xffff, NULL, RETURN), // Return
@@ -281,6 +348,7 @@ USB_KEYMAP_DECLARATION {
   //USB_KEYMAP(0x0700a0, 0x0000, 0x0000, 0x0000, 0xffff, NULL, OUT), // Out
   //USB_KEYMAP(0x0700a1, 0x0000, 0x0000, 0x0000, 0xffff, NULL, OPER), // Oper
   //USB_KEYMAP(0x0700a2, 0x0000, 0x0000, 0x0000, 0xffff, NULL, CLEAR_AGAIN),
+  // USB#0x0700a3 Props -- see note L2 at top.
   USB_KEYMAP(0x0700a3, 0x0000, 0x0000, 0x0000, 0xffff, "Props", PROPS), // CrSel/Props
   //USB_KEYMAP(0x0700a4, 0x0000, 0x0000, 0x0000, 0xffff, NULL, EX_SEL), // ExSel
 
@@ -337,7 +405,7 @@ USB_KEYMAP_DECLARATION {
   //USB_KEYMAP(0x0700d5, 0x0000, 0x0000, 0x0000, 0xffff, NULL, NUMPAD_MEMORY_MULTIPLE),
   //USB_KEYMAP(0x0700d6, 0x0000, 0x0000, 0x0000, 0xffff, NULL, NUMPAD_MEMORY_DIVIDE),
   USB_KEYMAP(0x0700d7, 0x0076, 0x007e, 0x0000, 0xffff, NULL, NUMPAD_SIGN_CHANGE), // +/-
-
+  // USB#0x0700d8 Keypad Clear -- see note L1 at top.
   USB_KEYMAP(0x0700d8, 0x0000, 0x0000, 0x0000, 0xffff, "NumpadClear", NUMPAD_CLEAR),
   USB_KEYMAP(0x0700d9, 0x0000, 0x0000, 0x0000, 0xffff, "NumpadClearEntry",
              NUMPAD_CLEAR_ENTRY),  // Keypad_ClearEntry
@@ -374,13 +442,9 @@ USB_KEYMAP_DECLARATION {
   // found match.
 
   // TODO(garykac): Find appropriate mappings for:
-  // Win#e06b LaunchApp1 (My Computer?)
-  // Win#e021 LaunchApp2 (Calculator?)
   // Win#e03c Music - USB#0c0193 is AL_AVCapturePlayback
-  // Win#e06d Video - USB#0c0193 is AL_AVCapturePlayback
   // Win#e064 Pictures
   // XKB#0080 XF86LaunchA
-  // XKB#0097 XF86WakeUp
   // XKB#0099 XF86Send
   // XKB#009b XF86Xfer
   // XKB#009c XF86Launch1
@@ -405,19 +469,19 @@ USB_KEYMAP_DECLARATION {
   //USB_KEYMAP(0x0c00b3, 0x00d0, 0x00d8, 0x????, 0x????, "MediaFastForward",
   //           MEDIA_FAST_FORWARD),
   //USB_KEYMAP(0x0c00b4, 0x00a8, 0x00b0, 0x????, 0x????, "MediaRewind", MEDIA_REWIND),
-  USB_KEYMAP(0x0c00b5, 0x0000, 0x0000, 0xe019, 0xffff, "MediaTrackNext",
+  USB_KEYMAP(0x0c00b5, 0x00a3, 0x00ab, 0xe019, 0xffff, "MediaTrackNext",
              MEDIA_TRACK_NEXT),
-  USB_KEYMAP(0x0c00b6, 0x0000, 0x0000, 0xe010, 0xffff, "MediaTrackPrevious",
+  USB_KEYMAP(0x0c00b6, 0x00a5, 0x00ad, 0xe010, 0xffff, "MediaTrackPrevious",
              MEDIA_TRACK_PREVIOUS),
-  USB_KEYMAP(0x0c00b7, 0x0000, 0x0000, 0xe024, 0xffff, "MediaStop", MEDIA_STOP),
-  USB_KEYMAP(0x0c00b8, 0x0000, 0x0000, 0xe02c, 0xffff, "Eject", EJECT),
-  USB_KEYMAP(0x0c00cd, 0x0000, 0x0000, 0xe022, 0xffff, "MediaPlayPause",
+  USB_KEYMAP(0x0c00b7, 0x00a6, 0x00ae, 0xe024, 0xffff, "MediaStop", MEDIA_STOP),
+  USB_KEYMAP(0x0c00b8, 0x00a1, 0x00a9, 0xe02c, 0xffff, "Eject", EJECT),
+  USB_KEYMAP(0x0c00cd, 0x00a4, 0x00ac, 0xe022, 0xffff, "MediaPlayPause",
              MEDIA_PLAY_PAUSE),
   USB_KEYMAP(0x0c00cf, 0x0246, 0x024e, 0x0000, 0xffff, NULL, VOICE_COMMAND),
   // USB#0c0183: AL Consumer Control Configuration
-  USB_KEYMAP(0x0c0183, 0x0000, 0x0000, 0x0000, 0xffff, "MediaSelect", MEDIA_SELECT),
+  USB_KEYMAP(0x0c0183, 0x00ab, 0x00b3, 0xe06d, 0xffff, "MediaSelect", MEDIA_SELECT),
   // USB#0x0c018a AL_EmailReader
-  USB_KEYMAP(0x0c018a, 0x0000, 0x0000, 0xe01e, 0xffff, "LaunchMail", LAUNCH_MAIL),
+  USB_KEYMAP(0x0c018a, 0x009b, 0x018a, 0xe06c, 0xffff, "LaunchMail", LAUNCH_MAIL),
   // USB#0x0c018d: AL Contacts/Address Book
   //USB_KEYMAP(0x0c018d, 0x01ad, 0x01b5, 0x0000, 0xffff, NULL, LAUNCH_CONTACTS),
   // USB#0x0c018e: AL Calendar/Schedule
@@ -427,9 +491,9 @@ USB_KEYMAP_DECLARATION {
   // USB#0x0c0190: AL Log/Journal/Timecard
   //USB_KEYMAP(0x0c0190, 0x0242, 0x024a, 0x0000, 0xffff, NULL, LAUNCH_LOG),
   // USB#0x0c0192: AL_Calculator
-  USB_KEYMAP(0x0c0192, 0x008c, 0x0094, 0x0000, 0xffff, "LaunchApp2", LAUNCH_APP2),
+  USB_KEYMAP(0x0c0192, 0x008c, 0x0094, 0xe021, 0xffff, "LaunchApp2", LAUNCH_APP2),
   // USB#0c0194: My Computer (AL_LocalMachineBrowser)
-  USB_KEYMAP(0x0c0194, 0x009d, 0x00a5, 0x0000, 0xffff, "LaunchApp1", LAUNCH_APP1),
+  USB_KEYMAP(0x0c0194, 0x0090, 0x0098, 0xe06b, 0xffff, "LaunchApp1", LAUNCH_APP1),
   //USB_KEYMAP(0x0c0196, 0x0096, 0x009e, 0x0000, 0xffff, NULL, LAUNCH_INTERNET_BROWSER),
   // USB#0x0c019e: AL Terminal Lock/Screensaver
   USB_KEYMAP(0x0c019e, 0x0098, 0x00a0, 0x0000, 0xffff, NULL, LOCK_SCREEN),
@@ -444,22 +508,22 @@ USB_KEYMAP_DECLARATION {
   USB_KEYMAP(0x0c01b1, 0x0245, 0x024d, 0x0000, 0xffff, "LaunchScreenSaver",
              LAUNCH_SCREEN_SAVER),  // AL Screen Saver
   // USB#0c01b4: Home Directory (AL_FileBrowser) (Explorer)
-  USB_KEYMAP(0x0c01b4, 0x0090, 0x0098, 0x0000, 0xffff, NULL, LAUNCH_FILE_BROWSER),
+  //USB_KEYMAP(0x0c01b4, 0x0000, 0x0000, 0x0000, 0xffff, NULL, LAUNCH_FILE_BROWSER),
   // USB#0x0c01b7: AL Audio Browser
   //USB_KEYMAP(0x0c01b7, 0x0188, 0x0190, 0x0000, 0xffff, NULL, LAUNCH_AUDIO_BROWSER),
   // USB#0x0c0208: AC Print
   //USB_KEYMAP(0x0c0208, 0x00d2, 0x00da, 0x0000, 0xffff, NULL, PRINT),
   // USB#0x0c0221:  AC_Search
-  USB_KEYMAP(0x0c0221, 0x0000, 0x0000, 0xe065, 0xffff, "BrowserSearch", BROWSER_SEARCH),
+  USB_KEYMAP(0x0c0221, 0x00d9, 0x00e1, 0xe065, 0xffff, "BrowserSearch", BROWSER_SEARCH),
   // USB#0x0c0223:  AC_Home
-  USB_KEYMAP(0x0c0223, 0x0000, 0x0000, 0xe032, 0xffff, "BrowserHome", BROWSER_HOME),
+  USB_KEYMAP(0x0c0223, 0x00ac, 0x00b4, 0xe032, 0xffff, "BrowserHome", BROWSER_HOME),
   // USB#0x0c0224:  AC_Back
   USB_KEYMAP(0x0c0224, 0x009e, 0x00a6, 0xe06a, 0xffff, "BrowserBack", BROWSER_BACK),
   // USB#0x0c0225:  AC_Forward
   USB_KEYMAP(0x0c0225, 0x009f, 0x00a7, 0xe069, 0xffff, "BrowserForward",
              BROWSER_FORWARD),
   // USB#0x0c0226:  AC_Stop
-  USB_KEYMAP(0x0c0226, 0x0000, 0x0000, 0xe068, 0xffff, "BrowserStop", BROWSER_STOP),
+  USB_KEYMAP(0x0c0226, 0x0080, 0x0088, 0xe068, 0xffff, "BrowserStop", BROWSER_STOP),
   // USB#0x0c0227:  AC_Refresh (Reload)
   USB_KEYMAP(0x0c0227, 0x00ad, 0x00b5, 0xe067, 0xffff, "BrowserRefresh",
              BROWSER_REFRESH),
diff --git a/ui/events/keycodes/dom/keycode_converter_unittest.cc b/ui/events/keycodes/dom/keycode_converter_unittest.cc
index a45d921..b556284 100644
--- a/ui/events/keycodes/dom/keycode_converter_unittest.cc
+++ b/ui/events/keycodes/dom/keycode_converter_unittest.cc
@@ -16,13 +16,11 @@ using ui::KeycodeConverter;
 namespace {
 
 #if defined(OS_WIN)
-const size_t kExpectedMappedKeyCount = 139;
-#elif defined(OS_LINUX)
-const size_t kExpectedMappedKeyCount = 168;
+const size_t kExpectedMappedKeyCount = 157;
+#elif defined(OS_LINUX) || defined(OS_ANDROID)
+const size_t kExpectedMappedKeyCount = 178;
 #elif defined(OS_MACOSX)
 const size_t kExpectedMappedKeyCount = 118;
-#elif defined(OS_ANDROID)
-const size_t kExpectedMappedKeyCount = 168;
 #else
 const size_t kExpectedMappedKeyCount = 0;
 #endif