[Android DomKey] Fix 7 Android DomKey mapping to match FF

ui/events/keycodes/keyboard_code_conversion_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/keyboard_code_conversion_android.h"
 
 #include <android/keycodes.h>
 
 namespace ui {
 namespace {
@@ skipping 109 matching lines @@
     case AKEYCODE_MEDIA_REWIND:
       return DomKey::MEDIA_REWIND;
     case AKEYCODE_MEDIA_FAST_FORWARD:
       return DomKey::MEDIA_FAST_FORWARD;
     case AKEYCODE_MUTE:
       return DomKey::AUDIO_VOLUME_MUTE;
     case AKEYCODE_PAGE_UP:
       return DomKey::PAGE_UP;
     case AKEYCODE_PAGE_DOWN:
       return DomKey::PAGE_DOWN;
+    case AKEYCODE_SWITCH_CHARSET:
+      return DomKey::MODE_CHANGE;
     case AKEYCODE_ESCAPE:
       return DomKey::ESCAPE;
     case AKEYCODE_FORWARD_DEL:
       return DomKey::DEL;
     case AKEYCODE_CTRL_LEFT:
     case AKEYCODE_CTRL_RIGHT:
       return DomKey::CONTROL;
     case AKEYCODE_CAPS_LOCK:
       return DomKey::CAPS_LOCK;
     case AKEYCODE_SCROLL_LOCK:
       return DomKey::SCROLL_LOCK;
     case AKEYCODE_META_LEFT:
     case AKEYCODE_META_RIGHT:
       return DomKey::META;
     case AKEYCODE_FUNCTION:
       return DomKey::FN;
     case AKEYCODE_SYSRQ:
       return DomKey::PRINT_SCREEN;
     case AKEYCODE_BREAK:
       return DomKey::PAUSE;
     case AKEYCODE_MOVE_HOME:
       return DomKey::HOME;
     case AKEYCODE_MOVE_END:
       return DomKey::END;
     case AKEYCODE_INSERT:
       return DomKey::INSERT;
     case AKEYCODE_FORWARD:
-      return DomKey::MEDIA_SKIP;
+      return DomKey::BROWSER_FORWARD;
     case AKEYCODE_MEDIA_PLAY:
       return DomKey::MEDIA_PLAY;
     case AKEYCODE_MEDIA_PAUSE:
       return DomKey::MEDIA_PAUSE;
     case AKEYCODE_MEDIA_CLOSE:
       return DomKey::CLOSE;
     case AKEYCODE_MEDIA_EJECT:
       return DomKey::EJECT;
     case AKEYCODE_MEDIA_RECORD:
       return DomKey::MEDIA_RECORD;
@@ skipping 16 matching lines @@
     case AKEYCODE_F9:
       return DomKey::F9;
     case AKEYCODE_F10:
       return DomKey::F10;
     case AKEYCODE_F11:
       return DomKey::F11;
     case AKEYCODE_F12:
       return DomKey::F12;
     case AKEYCODE_NUM_LOCK:
       return DomKey::NUM_LOCK;
+    case AKEYCODE_NUMPAD_ENTER:
+      return DomKey::ENTER;
     case AKEYCODE_VOLUME_MUTE:
       return DomKey::AUDIO_VOLUME_MUTE;
     case AKEYCODE_INFO:
       return DomKey::INFO;
     case AKEYCODE_CHANNEL_UP:
       return DomKey::CHANNEL_UP;
     case AKEYCODE_CHANNEL_DOWN:
       return DomKey::CHANNEL_DOWN;
     case AKEYCODE_ZOOM_IN:
       return DomKey::ZOOM_IN;
     case AKEYCODE_ZOOM_OUT:
       return DomKey::ZOOM_OUT;
     case AKEYCODE_TV:
       return DomKey::TV;
     case AKEYCODE_GUIDE:
       return DomKey::GUIDE;
+    case AKEYCODE_BOOKMARK:
+      return DomKey::BROWSER_FAVORITES;
     case AKEYCODE_CAPTIONS:
       return DomKey::CLOSED_CAPTION_TOGGLE;
     case AKEYCODE_SETTINGS:
       return DomKey::SETTINGS;
     case AKEYCODE_TV_POWER:
       return DomKey::TV_POWER;
     case AKEYCODE_TV_INPUT:
       return DomKey::TV_INPUT;
     case AKEYCODE_STB_POWER:
       return DomKey::STB_POWER;
     case AKEYCODE_STB_INPUT:
       return DomKey::STB_INPUT;
     case AKEYCODE_AVR_POWER:
       return DomKey::AVR_POWER;
     case AKEYCODE_AVR_INPUT:
       return DomKey::AVR_INPUT;
     case AKEYCODE_PROG_RED:
       return DomKey::COLOR_F0_RED;
     case AKEYCODE_PROG_GREEN:
       return DomKey::COLOR_F1_GREEN;
     case AKEYCODE_PROG_YELLOW:
       return DomKey::COLOR_F2_YELLOW;
     case AKEYCODE_PROG_BLUE:
       return DomKey::COLOR_F3_BLUE;
+    case AKEYCODE_LANGUAGE_SWITCH:
+      return DomKey::GROUP_NEXT;
     case AKEYCODE_CALENDAR:
       return DomKey::LAUNCH_CALENDAR;
     case AKEYCODE_MUSIC:
       return DomKey::LAUNCH_MUSIC_PLAYER;
     case AKEYCODE_CALCULATOR:
       return DomKey::LAUNCH_CALCULATOR;
     case AKEYCODE_ZENKAKU_HANKAKU:
       return DomKey::ZENKAKU_HANKAKU;
     case AKEYCODE_EISU:
       return DomKey::EISU;
+    case AKEYCODE_MUHENKAN:
+      return DomKey::NON_CONVERT;
+    case AKEYCODE_HENKAN:
+      return DomKey::CONVERT;
     case AKEYCODE_KATAKANA_HIRAGANA:
       return DomKey::HIRAGANA_KATAKANA;
     case AKEYCODE_BRIGHTNESS_DOWN:
       return DomKey::BRIGHTNESS_DOWN;
     case AKEYCODE_BRIGHTNESS_UP:
       return DomKey::BRIGHTNESS_UP;
     case AKEYCODE_SLEEP:
       return DomKey::STANDBY;
     case AKEYCODE_WAKEUP:
       return DomKey::WAKE_UP;
@@ skipping 73 matching lines @@
     // case AKEYCODE_NUMPAD_6:
     // case AKEYCODE_NUMPAD_7:
     // case AKEYCODE_NUMPAD_8:
     // case AKEYCODE_NUMPAD_9:
     // case AKEYCODE_NUMPAD_DIVIDE:
     // case AKEYCODE_NUMPAD_MULTIPLY:
     // case AKEYCODE_NUMPAD_SUBTRACT:
     // case AKEYCODE_NUMPAD_ADD:
     // case AKEYCODE_NUMPAD_DOT:
     // case AKEYCODE_NUMPAD_COMMA:
-    // case AKEYCODE_NUMPAD_ENTER:
     // case AKEYCODE_NUMPAD_EQUALS:
     // case AKEYCODE_NUMPAD_LEFT_PAREN:
     // case AKEYCODE_NUMPAD_RIGHT_PAREN:
     // case AKEYCODE_SPACE:
     // case AKEYCODE_PLUS:
 
     // The following codes are unsupported. ie; there is no
     // applicable mapping from the Android keycode to DOM Code
     // currently.
 
     // case AKEYCODE_SOFT_LEFT:
     // case AKEYCODE_SOFT_RIGHT:
     // case AKEYCODE_CALL:
     // case AKEYCODE_ENDCALL:
     // case AKEYCODE_DPAD_CENTER:
     // case AKEYCODE_HEADSETHOOK:
     // case AKEYCODE_FOCUS:
     // case AKEYCODE_NOTIFICATION:
     // case AKEYCODE_PICTSYMBOLS:
-    // case AKEYCODE_SWITCH_CHARSET:
     // case AKEYCODE_BUTTON_A:
     // case AKEYCODE_BUTTON_B:
     // case AKEYCODE_BUTTON_C:
     // case AKEYCODE_BUTTON_X:
     // case AKEYCODE_BUTTON_Y:
     // case AKEYCODE_BUTTON_Z:
     // case AKEYCODE_BUTTON_L1:
     // case AKEYCODE_BUTTON_R1:
     // case AKEYCODE_BUTTON_L2:
     // case AKEYCODE_BUTTON_R2:
     // case AKEYCODE_BUTTON_THUMBL:
     // case AKEYCODE_BUTTON_THUMBR:
     // case AKEYCODE_BUTTON_START:
     // case AKEYCODE_BUTTON_SELECT:
     // case AKEYCODE_BUTTON_MODE:
     // case AKEYCODE_WINDOW:
     // case AKEYCODE_DVR:
-    // case AKEYCODE_BOOKMARK:
     // case AKEYCODE_APP_SWITCH:
     // case AKEYCODE_BUTTON_1:
     // case AKEYCODE_BUTTON_2:
     // case AKEYCODE_BUTTON_3:
     // case AKEYCODE_BUTTON_4:
     // case AKEYCODE_BUTTON_5:
     // case AKEYCODE_BUTTON_6:
     // case AKEYCODE_BUTTON_7:
     // case AKEYCODE_BUTTON_8:
     // case AKEYCODE_BUTTON_9:
     // case AKEYCODE_BUTTON_10:
     // case AKEYCODE_BUTTON_11:
     // case AKEYCODE_BUTTON_12:
     // case AKEYCODE_BUTTON_13:
     // case AKEYCODE_BUTTON_14:
     // case AKEYCODE_BUTTON_15:
     // case AKEYCODE_BUTTON_16:
-    // case AKEYCODE_LANGUAGE_SWITCH:
     // case AKEYCODE_MANNER_MODE:
     // case AKEYCODE_3D_MODE:
     // case AKEYCODE_CONTACTS:
-    // case AKEYCODE_MUHENKAN:
-    // case AKEYCODE_HENKAN:
     // case AKEYCODE_YEN:
     // case AKEYCODE_RO:
     // case AKEYCODE_KANA:
     // case AKEYCODE_ASSIST:
     // case AKEYCODE_MEDIA_AUDIO:
     // case AKEYCODE_PAIRING:
     // case AKEYCODE_MEDIA_TOP:
     // case AKEYCODE_11:
     // case AKEYCODE_12:
     // case AKEYCODE_TV_DATA:
@@ skipping 289 matching lines @@
     case AKEYCODE_CHANNEL_UP:
       return VKEY_PRIOR;
     case AKEYCODE_CHANNEL_DOWN:
       return VKEY_NEXT;
     default:
       return VKEY_UNKNOWN;
   }
 }
 
 }  // namespace ui