Revise ui::DomKey to unify character and non-character codes.

ui/events/keycodes/dom_us_layout_data.h

 // Copyright (c) 2015 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.
 
 #ifndef UI_EVENTS_KEYCODES_DOM_US_LAYOUT_DATA_H_
 #define UI_EVENTS_KEYCODES_DOM_US_LAYOUT_DATA_H_
 
 namespace ui {
 
 // This table maps a DomCode to a printable character, assuming US layout.
-// It is used by DomCodeToUsLayoutMeaning(), which provides a fallback
+// It is used by DomCodeToUsLayoutDomKey(), which provides a fallback
 // interpretation when there is no other way to map a physical key.
 const struct PrintableCodeEntry {
   DomCode dom_code;
   base::char16 character[2];  // normal, shift
 } kPrintableCodeMap[] = {
     {DomCode::KEY_A, {'a', 'A'}},
     {DomCode::KEY_B, {'b', 'B'}},
     {DomCode::KEY_C, {'c', 'C'}},
     {DomCode::KEY_D, {'d', 'D'}},
     {DomCode::KEY_E, {'e', 'E'}},
@@ skipping 59 matching lines @@
     {DomCode::NUMPAD0, {'0', '0'}},
     {DomCode::NUMPAD_DECIMAL, {'.', '.'}},
     {DomCode::NUMPAD_EQUAL, {'=', '='}},
     {DomCode::NUMPAD_COMMA, {',', ','}},
     {DomCode::NUMPAD_PAREN_LEFT, {'(', '('}},
     {DomCode::NUMPAD_PAREN_RIGHT, {')', ')'}},
     {DomCode::NUMPAD_SIGN_CHANGE, {0x00B1, 0x00B1}},
 };
 
 // This table maps a DomCode to a DomKey, assuming US keyboard layout.
-// It is used by DomCodeToUsLayoutMeaning(), which provides a fallback
+// It is used by DomCodeToUsLayoutDomKey(), which provides a fallback
 // interpretation when there is no other way to map a physical key.
 const struct NonPrintableCodeEntry {
   DomCode dom_code;
   DomKey dom_key;
-  base::char16 character;
 } kNonPrintableCodeMap[] = {
     {DomCode::ABORT, DomKey::CANCEL},
     {DomCode::AGAIN, DomKey::AGAIN},
     {DomCode::ALT_LEFT, DomKey::ALT},
     {DomCode::ALT_RIGHT, DomKey::ALT},
     {DomCode::ARROW_DOWN, DomKey::ARROW_DOWN},
     {DomCode::ARROW_LEFT, DomKey::ARROW_LEFT},
     {DomCode::ARROW_RIGHT, DomKey::ARROW_RIGHT},
     {DomCode::ARROW_UP, DomKey::ARROW_UP},
-    {DomCode::BACKSPACE, DomKey::BACKSPACE, 0x0008},
+    {DomCode::BACKSPACE, DomKey::BACKSPACE},
     {DomCode::BRIGHTNESS_DOWN, DomKey::BRIGHTNESS_DOWN},
     {DomCode::BRIGHTNESS_UP, DomKey::BRIGHTNESS_UP},
     // {DomCode::BRIGHTNESS_AUTO, DomKey::_}
     // {DomCode::BRIGHTNESS_MAXIMUM, DomKey::_}
     // {DomCode::BRIGHTNESS_MINIMIUM, DomKey::_}
     // {DomCode::BRIGHTNESS_TOGGLE, DomKey::_}
     {DomCode::BROWSER_BACK, DomKey::BROWSER_BACK},
     {DomCode::BROWSER_FAVORITES, DomKey::BROWSER_FAVORITES},
     {DomCode::BROWSER_FORWARD, DomKey::BROWSER_FORWARD},
     {DomCode::BROWSER_HOME, DomKey::BROWSER_HOME},
     {DomCode::BROWSER_REFRESH, DomKey::BROWSER_REFRESH},
     {DomCode::BROWSER_SEARCH, DomKey::BROWSER_SEARCH},
     {DomCode::BROWSER_STOP, DomKey::BROWSER_STOP},
     {DomCode::CAPS_LOCK, DomKey::CAPS_LOCK},
     {DomCode::CONTEXT_MENU, DomKey::CONTEXT_MENU},
     {DomCode::CONTROL_LEFT, DomKey::CONTROL},
     {DomCode::CONTROL_RIGHT, DomKey::CONTROL},
     {DomCode::CONVERT, DomKey::CONVERT},
     {DomCode::COPY, DomKey::COPY},
     {DomCode::CUT, DomKey::CUT},
-    {DomCode::DEL, DomKey::DEL, 0x007F},
+    {DomCode::DEL, DomKey::DEL},
     {DomCode::EJECT, DomKey::EJECT},
     {DomCode::END, DomKey::END},
-    {DomCode::ENTER, DomKey::ENTER, 0x000D},
-    {DomCode::ESCAPE, DomKey::ESCAPE, 0x001B},
+    {DomCode::ENTER, DomKey::ENTER},
+    {DomCode::ESCAPE, DomKey::ESCAPE},
     {DomCode::F1, DomKey::F1},
     {DomCode::F2, DomKey::F2},
     {DomCode::F3, DomKey::F3},
     {DomCode::F4, DomKey::F4},
     {DomCode::F5, DomKey::F5},
     {DomCode::F6, DomKey::F6},
     {DomCode::F7, DomKey::F7},
     {DomCode::F8, DomKey::F8},
     {DomCode::F9, DomKey::F9},
     {DomCode::F10, DomKey::F10},
@@ skipping 37 matching lines @@
     {DomCode::MAIL_REPLY, DomKey::MAIL_REPLY},
     {DomCode::MAIL_SEND, DomKey::MAIL_SEND},
     {DomCode::MEDIA_PLAY_PAUSE, DomKey::MEDIA_PLAY_PAUSE},
     {DomCode::MEDIA_SELECT, DomKey::MEDIA_SELECT},
     {DomCode::MEDIA_STOP, DomKey::MEDIA_STOP},
     {DomCode::MEDIA_TRACK_NEXT, DomKey::MEDIA_TRACK_NEXT},
     {DomCode::MEDIA_TRACK_PREVIOUS, DomKey::MEDIA_TRACK_PREVIOUS},
     // {DomCode::MENU, DomKey::_}
     {DomCode::NON_CONVERT, DomKey::NON_CONVERT},
     {DomCode::NUM_LOCK, DomKey::NUM_LOCK},
-    {DomCode::NUMPAD_BACKSPACE, DomKey::BACKSPACE, 0x0008},
+    {DomCode::NUMPAD_BACKSPACE, DomKey::BACKSPACE},
     {DomCode::NUMPAD_CLEAR, DomKey::CLEAR},
-    {DomCode::NUMPAD_ENTER, DomKey::ENTER, 0x000D},
+    {DomCode::NUMPAD_ENTER, DomKey::ENTER},
     // {DomCode::NUMPAD_CLEAR_ENTRY, DomKey::_}
     // {DomCode::NUMPAD_MEMORY_ADD, DomKey::_}
     // {DomCode::NUMPAD_MEMORY_CLEAR, DomKey::_}
     // {DomCode::NUMPAD_MEMORY_RECALL, DomKey::_}
     // {DomCode::NUMPAD_MEMORY_STORE, DomKey::_}
     // {DomCode::NUMPAD_MEMORY_SUBTRACT, DomKey::_}
     {DomCode::OPEN, DomKey::OPEN},
     {DomCode::OS_LEFT, DomKey::OS},
     {DomCode::OS_RIGHT, DomKey::OS},
     {DomCode::PAGE_DOWN, DomKey::PAGE_DOWN},
     {DomCode::PAGE_UP, DomKey::PAGE_UP},
     {DomCode::PASTE, DomKey::PASTE},
     {DomCode::PAUSE, DomKey::PAUSE},
     {DomCode::POWER, DomKey::POWER},
     {DomCode::PRINT_SCREEN, DomKey::PRINT_SCREEN},
     {DomCode::PROPS, DomKey::PROPS},
     {DomCode::SCROLL_LOCK, DomKey::SCROLL_LOCK},
     {DomCode::SELECT, DomKey::SELECT},
     // {DomCode::SELECT_TASK, DomKey::_}
     {DomCode::SHIFT_LEFT, DomKey::SHIFT},
     {DomCode::SHIFT_RIGHT, DomKey::SHIFT},
     {DomCode::SUPER, DomKey::SUPER},
-    {DomCode::TAB, DomKey::TAB, 0x0009},
+    {DomCode::TAB, DomKey::TAB},
     {DomCode::UNDO, DomKey::UNDO},
     // {DomCode::VOICE_COMMAND, DomKey::_}
     {DomCode::VOLUME_DOWN, DomKey::VOLUME_DOWN},
     {DomCode::VOLUME_MUTE, DomKey::VOLUME_MUTE},
     {DomCode::VOLUME_UP, DomKey::VOLUME_UP},
     {DomCode::WAKE_UP, DomKey::WAKE_UP},
     {DomCode::ZOOM_TOGGLE, DomKey::ZOOM_TOGGLE},
 };
 
 // This table maps a DomKey to a non-located KeyboardCode.
@@ skipping 397 matching lines @@
     //  VKEY_MODECHANGE
     //  VKEY_NONAME
     //  VKEY_PA1
     //  VKEY_PACKET
     //  VKEY_PROCESSKEY
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_KEYCODES_DOM_US_LAYOUT_DATA_H_