Index: base/event_types.h |
diff --git a/base/event_types.h b/base/event_types.h |
index 092ec7f33faf969cc8e03a22646d69cebf6b488d..f9162340da39d53d82f4d1444cc43f16e0c57ed5 100644 |
--- a/base/event_types.h |
+++ b/base/event_types.h |
@@ -10,9 +10,9 @@ |
#if defined(OS_WIN) |
#include <windows.h> |
-#endif |
- |
-#if defined(USE_X11) |
+#elif defined(USE_WAYLAND) |
+#include "base/wayland/wayland_event.h" |
+#elif defined(USE_X11) |
typedef union _XEvent XEvent; |
#endif |
@@ -21,13 +21,10 @@ namespace base { |
// Cross platform typedefs for native event types. |
#if defined(OS_WIN) |
typedef MSG NativeEvent; |
+#elif defined(USE_WAYLAND) |
+typedef wayland::WaylandEvent* NativeEvent; |
#elif defined(USE_X11) |
typedef XEvent* NativeEvent; |
-#elif defined(USE_WAYLAND) |
-// WaylandEvent is currently defined in ui component and cannot be |
-// used in base component. Probably wayland maintainer has to move it |
-// outside of ui in order to define NativeEvent for wayland here. |
-typedef void* NativeEvent; |
#else |
typedef void* NativeEvent; |
#endif |