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

Unified Diff: views/native_types.h

Issue 6488012: Revert 74518 - Refactor TOUCH_UI to match other refactor.... (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_touch.cc ('k') | views/touchui/gesture_manager.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 74519)
+++ views/native_types.h (working copy)
@@ -8,21 +8,18 @@
#include "ui/gfx/native_widget_types.h"
-#if defined(TOUCH_UI)
-typedef union _XEvent XEvent;
-#elif defined(OS_LINUX)
-typedef union _GdkEvent GdkEvent;
-#endif
-
namespace views {
#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;
-#elif defined(OS_LINUX)
-typedef GdkEvent* NativeEvent;
#endif
} // namespace views
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/touchui/gesture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698