Index: ui/events/keycodes/keyboard_code_conversion_android.cc |
diff --git a/ui/events/keycodes/keyboard_code_conversion_android.cc b/ui/events/keycodes/keyboard_code_conversion_android.cc |
index 6d7a0cb564a67b165e52d0f710790314d0a337b3..72f81b3e1a76c9c43ba17cdd8183d6218966cfa3 100644 |
--- a/ui/events/keycodes/keyboard_code_conversion_android.cc |
+++ b/ui/events/keycodes/keyboard_code_conversion_android.cc |
@@ -8,59 +8,6 @@ |
namespace ui { |
-namespace { |
- |
-// The Android NDK does not provide values for these yet: |
-enum { |
- AKEYCODE_ESCAPE = 111, |
- AKEYCODE_FORWARD_DEL = 112, |
- AKEYCODE_CTRL_LEFT = 113, |
- AKEYCODE_CTRL_RIGHT = 114, |
- AKEYCODE_CAPS_LOCK = 115, |
- AKEYCODE_SCROLL_LOCK = 116, |
- AKEYCODE_META_LEFT = 117, |
- AKEYCODE_META_RIGHT = 118, |
- AKEYCODE_BREAK = 121, |
- AKEYCODE_MOVE_HOME = 122, |
- AKEYCODE_MOVE_END = 123, |
- AKEYCODE_INSERT = 124, |
- AKEYCODE_MEDIA_PLAY = 126, |
- AKEYCODE_MEDIA_PAUSE = 127, |
- AKEYCODE_F1 = 131, |
- AKEYCODE_F2 = 132, |
- AKEYCODE_F3 = 133, |
- AKEYCODE_F4 = 134, |
- AKEYCODE_F5 = 135, |
- AKEYCODE_F6 = 136, |
- AKEYCODE_F7 = 137, |
- AKEYCODE_F8 = 138, |
- AKEYCODE_F9 = 139, |
- AKEYCODE_F10 = 140, |
- AKEYCODE_F11 = 141, |
- AKEYCODE_F12 = 142, |
- AKEYCODE_NUM_LOCK = 143, |
- AKEYCODE_NUMPAD_0 = 144, |
- AKEYCODE_NUMPAD_1 = 145, |
- AKEYCODE_NUMPAD_2 = 146, |
- AKEYCODE_NUMPAD_3 = 147, |
- AKEYCODE_NUMPAD_4 = 148, |
- AKEYCODE_NUMPAD_5 = 149, |
- AKEYCODE_NUMPAD_6 = 150, |
- AKEYCODE_NUMPAD_7 = 151, |
- AKEYCODE_NUMPAD_8 = 152, |
- AKEYCODE_NUMPAD_9 = 153, |
- AKEYCODE_NUMPAD_DIVIDE = 154, |
- AKEYCODE_NUMPAD_MULTIPLY = 155, |
- AKEYCODE_NUMPAD_SUBTRACT = 156, |
- AKEYCODE_NUMPAD_ADD = 157, |
- AKEYCODE_NUMPAD_DOT = 158, |
- AKEYCODE_VOLUME_MUTE = 164, |
- AKEYCODE_CHANNEL_UP = 166, |
- AKEYCODE_CHANNEL_DOWN = 167, |
-}; |
- |
-} // namespace |
- |
KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { |
Wez
2015/09/03 06:05:47
Couldn't we just replace this function with a keyc
dtapuska
2015/09/03 13:39:40
It makes more sense to me to go from scancode->Dom
dtapuska
2015/09/03 14:05:49
Ok I dug a little more and I do think we can avoid
dtapuska
2015/09/08 17:18:26
Done.
|
// Does not provide all key codes, and does not handle all keys. |
switch (keycode) { |
@@ -74,9 +21,9 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { |
case AKEYCODE_ENTER: |
return VKEY_RETURN; |
case AKEYCODE_SHIFT_LEFT: |
- return VKEY_LSHIFT; |
+ return VKEY_SHIFT; |
case AKEYCODE_SHIFT_RIGHT: |
- return VKEY_RSHIFT; |
+ return VKEY_SHIFT; |
case AKEYCODE_BACK: |
return VKEY_BROWSER_BACK; |
case AKEYCODE_FORWARD: |
@@ -207,9 +154,9 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { |
case AKEYCODE_MOVE_END: |
return VKEY_END; |
case AKEYCODE_ALT_LEFT: |
- return VKEY_LMENU; |
+ return VKEY_MENU; |
case AKEYCODE_ALT_RIGHT: |
- return VKEY_RMENU; |
+ return VKEY_MENU; |
case AKEYCODE_GRAVE: |
return VKEY_OEM_3; |
case AKEYCODE_APOSTROPHE: |
@@ -225,9 +172,9 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { |
case AKEYCODE_FORWARD_DEL: |
return VKEY_DELETE; |
case AKEYCODE_CTRL_LEFT: |
- return VKEY_LCONTROL; |
+ return VKEY_CONTROL; |
case AKEYCODE_CTRL_RIGHT: |
- return VKEY_RCONTROL; |
+ return VKEY_CONTROL; |
case AKEYCODE_CAPS_LOCK: |
return VKEY_CAPITAL; |
case AKEYCODE_SCROLL_LOCK: |
@@ -235,7 +182,7 @@ KeyboardCode KeyboardCodeFromAndroidKeyCode(int keycode) { |
case AKEYCODE_META_LEFT: |
return VKEY_LWIN; |
case AKEYCODE_META_RIGHT: |
- return VKEY_RWIN; |
+ return VKEY_LWIN; |
case AKEYCODE_BREAK: |
return VKEY_PAUSE; |
case AKEYCODE_INSERT: |