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

Unified Diff: views/native_types.h

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated files to latest and fixed changes for dependent CLs Created 9 years, 4 months 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: views/native_types.h
diff --git a/views/native_types.h b/views/native_types.h
index 7d8f50333f1ed811754c7df6cfa5fff38175bbfc..be661bc387b23de2cc0278042557d01357e20e1f 100644
--- a/views/native_types.h
+++ b/views/native_types.h
@@ -14,6 +14,11 @@ typedef union _GdkEvent GdkEvent;
#if defined(USE_X11)
typedef union _XEvent XEvent;
#endif
+#if defined(USE_WAYLAND)
+namespace ui {
+union WaylandEvent;
+}
+#endif
namespace views {
@@ -33,8 +38,12 @@ namespace views {
typedef MSG NativeEvent;
#endif
#if defined(OS_LINUX)
+#if defined(USE_WAYLAND)
+typedef ui::WaylandEvent* NativeEvent;
+#else
typedef GdkEvent* NativeEvent;
#endif
+#endif
#if defined(USE_X11)
typedef XEvent* NativeEvent2;
#else
« views/mouse_watcher.cc ('K') | « views/mouse_watcher.cc ('k') | views/view_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698