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

ui/events/keycodes/keyboard_code_conversion.h

Index: ui/events/keycodes/keyboard_code_conversion.h
diff --git a/ui/events/keycodes/keyboard_code_conversion.h b/ui/events/keycodes/keyboard_code_conversion.h
index 7b7618bd88f58cb724a4c2144b9aeffec4263001..526ead5c3a9eeb7fa3238a736636dafbf615b8bb 100644
--- a/ui/events/keycodes/keyboard_code_conversion.h
+++ b/ui/events/keycodes/keyboard_code_conversion.h
@@ -8,12 +8,12 @@
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "ui/events/events_base_export.h"
+#include "ui/events/keycodes/dom/dom_key.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
 
 enum class DomCode;
-enum class DomKey;
 
 // Helper functions to get the meaning of a Windows key code in a
 // platform independent way. It supports control characters as well.
@@ -35,10 +35,8 @@ enum class DomKey;
 // crbug.com/444045
 EVENTS_BASE_EXPORT base::char16 GetCharacterFromKeyCode(KeyboardCode key_code,
                                                         int flags);
-EVENTS_BASE_EXPORT bool GetMeaningFromKeyCode(KeyboardCode key_code,
-                                              int flags,
-                                              DomKey* dom_key,
-                                              base::char16* character);
+EVENTS_BASE_EXPORT DomKey GetDomKeyFromKeyCode(KeyboardCode key_code,
+                                               int flags);
 
 // Helper function to map a physical key state (dom_code and flags)
 // to a meaning (dom_key and character, together corresponding to the
@@ -50,11 +48,10 @@ EVENTS_BASE_EXPORT bool GetMeaningFromKeyCode(KeyboardCode key_code,
 // Returns true and sets the output parameters if the (dom_code, flags) pair
 // has an interpretation in the US English layout; otherwise the output
 // parameters are untouched.
-EVENTS_BASE_EXPORT bool DomCodeToUsLayoutMeaning(DomCode dom_code,
-                                                 int flags,
-                                                 DomKey* dom_key,
-                                                 base::char16* character,
-                                                 KeyboardCode* key_code)
+EVENTS_BASE_EXPORT bool DomCodeToUsLayoutDomKey(DomCode dom_code,
+                                                int flags,
+                                                DomKey* dom_key,
+                                                KeyboardCode* key_code)
     WARN_UNUSED_RESULT;
 
 // Obtains the control character corresponding to a physical key;
@@ -66,15 +63,9 @@ EVENTS_BASE_EXPORT bool DomCodeToUsLayoutMeaning(DomCode dom_code,
 EVENTS_BASE_EXPORT bool DomCodeToControlCharacter(DomCode dom_code,
                                                   int flags,
                                                   DomKey* dom_key,
-                                                  base::char16* character,
                                                   KeyboardCode* key_code)
     WARN_UNUSED_RESULT;
 
-// Returns the DomKey value associated with an ASCII/Unicode character.
-// All printable characters and most other character codes use
-// DomKey::CHARACTER, but a few ASCII C0 codes have their own DomKey.
-EVENTS_BASE_EXPORT DomKey CharacterToDomKey(uint32 character);
-
 // Returns a Windows-based VKEY for a non-printable DOM Level 3 |key|.
 // The returned VKEY is non-located (e.g. VKEY_SHIFT).
 EVENTS_BASE_EXPORT KeyboardCode