Consolidate/cleanup event cracking code; single out GdkEvents.

views/native_types.h

Index: views/native_types.h
diff --git a/views/native_types.h b/views/native_types.h
index a5070e7295cc731473374f7c01683666f2f0bcdc..af8c226f877836ff2d82dff36ade23c8d43ca203 100644
--- a/views/native_types.h
+++ b/views/native_types.h
@@ -6,19 +6,7 @@
 #define VIEWS_NATIVE_TYPES_H_
 #pragma once
 
-#include "ui/gfx/native_widget_types.h"
-
-#if defined(OS_LINUX)
-typedef union _GdkEvent GdkEvent;
-#endif
-#if defined(USE_X11)
-typedef union _XEvent XEvent;
-#endif
-#if defined(USE_WAYLAND)
-namespace ui {
-union WaylandEvent;
-}
-#endif
+#include "ui/base/events.h"
 
 #if defined(USE_AURA)
 namespace aura {
@@ -28,37 +16,13 @@ class Event;
 
 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(USE_AURA)
 typedef aura::Event* NativeEvent;
-#elif defined(OS_WIN)
-typedef MSG NativeEvent;
-#elif defined(OS_LINUX)
-
-#if defined(USE_WAYLAND)
-typedef ui::WaylandEvent* NativeEvent;
 #else
-typedef GdkEvent* NativeEvent;
-#endif
-
+typedef ui::NativeEvent NativeEvent;
 #endif
 
-#if defined(USE_X11)
-typedef XEvent* NativeEvent2;
-#else
-typedef void* NativeEvent2;
-#endif
+typedef ui::NativeEvent2 NativeEvent2;
 
 }  // namespace views