Revert "Revert 224496 "Move ui/base/latency_info* to ui/events""

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 8fd1e847051a5c9f62e7106f8fdba091a63ae2d0..80b38063fc1767482eb46cb8359627642f73d8fb 100644
--- a/ui/events/keycodes/keyboard_code_conversion_x.h
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h
@@ -6,22 +6,22 @@
 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_X_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/events/events_export.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
 
 typedef union _XEvent XEvent;
 
 namespace ui {
 
-UI_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
+EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(XEvent* xev);
 
-UI_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
+EVENTS_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym);
 
 // Returns a character on a standard US PC keyboard from an XEvent.
-UI_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
+EVENTS_EXPORT uint16 GetCharacterFromXEvent(XEvent* xev);
 
 // Converts a KeyboardCode into an X KeySym.
-UI_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift);
+EVENTS_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, bool shift);
 
 // Converts an X keycode into an X KeySym.
 unsigned int DefaultXKeysymFromHardwareKeycode(unsigned int keycode);