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

Unified Diff: views/native_types.h

Issue 6487002: Add a new constructor to KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 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
« no previous file with comments | « views/focus/accelerator_handler_win.cc ('k') | views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/native_types.h
===================================================================
--- views/native_types.h (revision 74437)
+++ views/native_types.h (working copy)
@@ -8,18 +8,37 @@
#include "ui/gfx/native_widget_types.h"
+#if defined(OS_LINUX)
+typedef union _GdkEvent GdkEvent;
+#endif
+#if defined(TOUCH_UI)
+typedef union _XEvent XEvent;
+#endif
+
namespace views {
+// A note about NativeEvent and NativeEvent2.
+// 1. Eventually TOOLKIT_VIEWS will converge on using XEvent as we remove
+// Gtk/Gdk from the stack.
+// 2. TOUCH_UI needs XEvents now for certain event types.
+// 3. TOUCH_UI also needs GdkEvents for certain event types.
+//
+// => NativeEvent and NativeEvent2.
+//
+// Once we replace usage of Gtk/Gdk types with Xlib types across the board in
+// views, we can remove NativeEvent2 and typedef XEvent* to NativeEvent. The
+// world will then be beautiful(ish).
+
#if defined(OS_WIN)
typedef MSG NativeEvent;
#endif
#if defined(OS_LINUX)
-typedef union _GdkEvent GdkEvent;
typedef GdkEvent* NativeEvent;
#endif
#if defined(TOUCH_UI)
-typedef union _XEvent XEvent;
-typedef XEvent* NativeEvent;
+typedef XEvent* NativeEvent2;
+#else
+typedef void* NativeEvent2;
#endif
} // namespace views
« no previous file with comments | « views/focus/accelerator_handler_win.cc ('k') | views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698