Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/keycodes/keyboard_code_conversion_x.h

Index: ui/events/keycodes/keyboard_code_conversion_x.h
diff --git a/ui/events/platform/x11/keyboard_code_conversion_x11.h b/ui/events/keycodes/keyboard_code_conversion_x.h
similarity index 72%
rename from ui/events/platform/x11/keyboard_code_conversion_x11.h
rename to ui/events/keycodes/keyboard_code_conversion_x.h
index f0c7231470d10497b1149b10578fdb5f64c91c3d..0eafb34d809e425ba613d0208d0c743af859391b 100644
--- a/ui/events/platform/x11/keyboard_code_conversion_x11.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
-#define UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
+#ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
+#define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
 
 #include "base/basictypes.h"
+#include "base/strings/string16.h"
 #include "ui/events/events_base_export.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 
@@ -14,15 +15,23 @@ typedef struct _XDisplay XDisplay;
 
 namespace ui {
 
+enum class DomCode;
+enum class DomKey;
+
 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev);
 
 EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
 
-EVENTS_BASE_EXPORT const char* CodeFromXEvent(const XEvent* xev);
+EVENTS_BASE_EXPORT DomCode CodeFromXEvent(const XEvent* xev);
 
 // Returns a character on a standard US PC keyboard from an XEvent.
 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);
+
 // Converts a KeyboardCode into an X KeySym.
 EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode,
                                                 bool shift);
@@ -37,7 +46,7 @@ EVENTS_BASE_EXPORT unsigned int XKeyCodeForWindowsKeyCode(KeyboardCode key_code,
 
 // Converts an X keycode into ui::KeyboardCode.
 EVENTS_BASE_EXPORT KeyboardCode
-DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);
+    DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code);
 
 // Initializes a core XKeyEvent from an XI2 key event.
 EVENTS_BASE_EXPORT void InitXKeyEventFromXIDeviceEvent(const XEvent& src,
@@ -45,4 +54,4 @@ EVENTS_BASE_EXPORT void InitXKeyEventFromXIDeviceEvent(const XEvent& src,
 
 }  // namespace ui
 
-#endif  // UI_EVENTS_PLATFORM_X11_KEYBOARD_CODE_CONVERSION_X11_H_
+#endif  // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_