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

ui/events/keycodes/keyboard_code_conversion_x.h

Index: ui/events/keycodes/keyboard_code_conversion_x.h
diff --git a/ui/events/keycodes/keyboard_code_conversion_x.h b/ui/events/keycodes/keyboard_code_conversion_x.h
index 0eafb34d809e425ba613d0208d0c743af859391b..7ead7c26b9194f5af51a58507b0ff57b87ef9b51 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.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_posix.h"
 
 typedef union _XEvent XEvent;
@@ -16,7 +17,6 @@ typedef struct _XDisplay XDisplay;
 namespace ui {
 
 enum class DomCode;
-enum class DomKey;
 
 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev);
 
@@ -28,9 +28,7 @@ EVENTS_BASE_EXPORT DomCode CodeFromXEvent(const XEvent* xev);
 EVENTS_BASE_EXPORT uint16 GetCharacterFromXEvent(const XEvent* xev);
 
 // Returns DomKey and character from an XEvent.
-EVENTS_BASE_EXPORT void GetMeaningFromXEvent(const XEvent* xev,
-                                             DomKey* key,
-                                             base::char16* character);
+EVENTS_BASE_EXPORT DomKey GetDomKeyFromXEvent(const XEvent* xev);
 
 // Converts a KeyboardCode into an X KeySym.
 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,