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 9d8cfaf1aad2e73b44bd64cecf0e0895dd842021..f2373916a2297b9bb6fb33739520bcd1220f19cc 100644 |
--- a/ui/events/keycodes/keyboard_code_conversion_x.h |
+++ b/ui/events/keycodes/keyboard_code_conversion_x.h |
@@ -8,9 +8,9 @@ |
#include <stdint.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" |
+#include "ui/events/keycodes/keycodes_x_export.h" |
typedef union _XEvent XEvent; |
typedef struct _XDisplay XDisplay; |
@@ -19,37 +19,37 @@ namespace ui { |
enum class DomCode; |
-EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev); |
+KEYCODES_X_EXPORT KeyboardCode KeyboardCodeFromXKeyEvent(const XEvent* xev); |
-EVENTS_BASE_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); |
+KEYCODES_X_EXPORT KeyboardCode KeyboardCodeFromXKeysym(unsigned int keysym); |
-EVENTS_BASE_EXPORT DomCode CodeFromXEvent(const XEvent* xev); |
+KEYCODES_X_EXPORT DomCode CodeFromXEvent(const XEvent* xev); |
// Returns a character on a standard US PC keyboard from an XEvent. |
-EVENTS_BASE_EXPORT uint16_t GetCharacterFromXEvent(const XEvent* xev); |
+KEYCODES_X_EXPORT uint16_t GetCharacterFromXEvent(const XEvent* xev); |
// Returns DomKey and character from an XEvent. |
-EVENTS_BASE_EXPORT DomKey GetDomKeyFromXEvent(const XEvent* xev); |
+KEYCODES_X_EXPORT DomKey GetDomKeyFromXEvent(const XEvent* xev); |
// Converts a KeyboardCode into an X KeySym. |
-EVENTS_BASE_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, |
- bool shift); |
+KEYCODES_X_EXPORT int XKeysymForWindowsKeyCode(KeyboardCode keycode, |
+ bool shift); |
// Returns a XKeyEvent keycode (scancode) for a KeyboardCode. Keyboard layouts |
// are usually not injective, so inverse mapping should be avoided when |
// practical. A round-trip keycode -> KeyboardCode -> keycode will not |
// necessarily return the original keycode. |
-EVENTS_BASE_EXPORT unsigned int XKeyCodeForWindowsKeyCode(KeyboardCode key_code, |
- int flags, |
- XDisplay* display); |
+KEYCODES_X_EXPORT unsigned int XKeyCodeForWindowsKeyCode(KeyboardCode key_code, |
+ int flags, |
+ XDisplay* display); |
// Converts an X keycode into ui::KeyboardCode. |
-EVENTS_BASE_EXPORT KeyboardCode |
- DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code); |
+KEYCODES_X_EXPORT KeyboardCode |
+DefaultKeyboardCodeFromHardwareKeycode(unsigned int hardware_code); |
// Initializes a core XKeyEvent from an XI2 key event. |
-EVENTS_BASE_EXPORT void InitXKeyEventFromXIDeviceEvent(const XEvent& src, |
- XEvent* dst); |
+KEYCODES_X_EXPORT void InitXKeyEventFromXIDeviceEvent(const XEvent& src, |
+ XEvent* dst); |
} // namespace ui |