Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: base/event_types.h

Issue 8378005: wayland: define base:NativeEvent for Wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per reviewer feedback. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « base/base.gypi ('k') | base/message_pump_wayland.h » ('j') | base/message_pump_wayland.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698