Index: base/event_types.h |
diff --git a/base/event_types.h b/base/event_types.h |
index 092ec7f33faf969cc8e03a22646d69cebf6b488d..f4234de119f2fb1b5cd0bcffa83d34b5c1d77fd2 100644 |
--- a/base/event_types.h |
+++ b/base/event_types.h |
@@ -10,9 +10,11 @@ |
#if defined(OS_WIN) |
#include <windows.h> |
-#endif |
- |
-#if defined(USE_X11) |
+#elif defined(USE_WAYLAND) |
+namespace ui { |
+union WaylandEvent; |
+} |
+#elif defined(USE_X11) |
oshima
2011/11/04 01:18:31
base cannot depend on ui, or has notion of ui. (ev
Elliot Glaysher
2011/11/04 01:20:23
+1. base/ is included by everything.
|
typedef union _XEvent XEvent; |
#endif |
@@ -21,13 +23,10 @@ namespace base { |
// Cross platform typedefs for native event types. |
#if defined(OS_WIN) |
typedef MSG NativeEvent; |
+#elif defined(USE_WAYLAND) |
+typedef ui::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 |