IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

base/event_types.h

Index: base/event_types.h
diff --git a/base/event_types.h b/base/event_types.h
index a1b78f6db2cff8fd72e9f2434bede7662aa04ccd..7fe95ba34721bd96bb39a285c59f6ee332af6a6f 100644
--- a/base/event_types.h
+++ b/base/event_types.h
@@ -17,6 +17,7 @@ union WaylandEvent;
 }
 }
 #elif defined(USE_X11)
+#include <X11/Xdefs.h>  // for XID
 typedef union _XEvent XEvent;
 #endif
 
@@ -25,12 +26,16 @@ namespace base {
 // Cross platform typedefs for native event types.
 #if defined(OS_WIN)
 typedef MSG NativeEvent;
+typedef HWND NativeWindow;
 #elif defined(USE_WAYLAND)
 typedef wayland::WaylandEvent* NativeEvent;
+// TODO: typedef NativeWindow.

[James Su, 2011/11/24 03:57:03]

WaylandWindow is in ui/, perhaps we need move native window definitions into a
special header file in ui/ ?

Anyway, let's keep it as is for now and clean it up later.

 #elif defined(USE_X11)
 typedef XEvent* NativeEvent;
+typedef XID NativeWindow;
 #else
 typedef void* NativeEvent;
+typedef void* NativeWindow;
 #endif
 
 } // namespace base