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

Unified Diff: views/native_types.h

Issue 7741001: Add Aura support to views: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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
« no previous file with comments | « views/focus/focus_manager.cc ('k') | views/views.gyp » ('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 98084)
+++ views/native_types.h (working copy)
@@ -15,6 +15,12 @@
typedef union _XEvent XEvent;
#endif
+#if defined(USE_AURA)
+namespace aura {
+class Event;
+}
+#endif
+
namespace views {
// A note about NativeEvent and NativeEvent2.
@@ -29,12 +35,14 @@
// views, we can remove NativeEvent2 and typedef XEvent* to NativeEvent. The
// world will then be beautiful(ish).
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+typedef aura::Event* NativeEvent;
+#elif defined(OS_WIN)
typedef MSG NativeEvent;
-#endif
-#if defined(OS_LINUX)
+#elif defined(OS_LINUX)
typedef GdkEvent* NativeEvent;
#endif
+
#if defined(USE_X11)
typedef XEvent* NativeEvent2;
#else
« no previous file with comments | « views/focus/focus_manager.cc ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698