Consolidate/cleanup event cracking code; single out GdkEvents.

views/events/event_aura.cc

Index: views/events/event_aura.cc
diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc
index 57c9d973e21756bcbd33fc1231b3a43394605bdb..f5bda061798edb3db9a925dce0d86c4e61b99419 100644
--- a/views/events/event_aura.cc
+++ b/views/events/event_aura.cc
@@ -9,84 +9,24 @@
 
 namespace views {
 
-namespace {
-
-int GetKeyStateFlags() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-ui::EventType EventTypeFromNative(NativeEvent native_event) {
-  return native_event->type();
-}
-
-int EventFlagsFromNative(NativeEvent native_event) {
-  return native_event->flags();
-}
-
-}
-
-bool IsClientMouseEvent(const views::NativeEvent& native_event) {
-  return true;
-}
-
-bool IsNonClientMouseEvent(const views::NativeEvent& native_event) {
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Event, private:
-
-void Event::Init() {
-}
-
-void Event::InitWithNativeEvent(NativeEvent native_event) {
-  native_event_ = native_event;
-  // TODO(beng): remove once we rid views of Gtk/Gdk.
-  native_event_2_ = NULL;
-}
-
-void Event::InitWithNativeEvent2(NativeEvent2 native_event_2,
-                                 FromNativeEvent2) {
-  // No one should ever call this on Aura.
-  // TODO(beng): remove once we rid views of Gtk/Gdk.
-  NOTREACHED();
-  native_event_2_ = NULL;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // LocatedEvent, protected:
 
-LocatedEvent::LocatedEvent(NativeEvent native_event)
+LocatedEvent::LocatedEvent(const NativeEvent& native_event)
     : Event(native_event, native_event->type(), native_event->flags()),
       location_(static_cast<aura::LocatedEvent*>(native_event)->location()) {
 }
 
-LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
-                           FromNativeEvent2 from_native)
-    : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
-  // No one should ever call this on Windows.
-  // TODO(msw): remove once we rid views of Gtk/Gdk.
-  NOTREACHED();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent, public:
 
-KeyEvent::KeyEvent(NativeEvent native_event)
-    : Event(native_event, native_event->type(), GetKeyStateFlags()),
+KeyEvent::KeyEvent(const NativeEvent& native_event)
+    : Event(native_event, native_event->type(), native_event->flags()),
       key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()),
       character_(0),
       unmodified_character_(0) {
 }
 
-KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native)
-    : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) {
-  // No one should ever call this on Windows.
-  // TODO(beng): remove once we rid views of Gtk/Gdk.
-  NOTREACHED();
-}
-
 uint16 KeyEvent::GetCharacter() const {
   NOTIMPLEMENTED();
   return key_code_;
@@ -98,34 +38,11 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// MouseEvent, public:
-
-MouseEvent::MouseEvent(NativeEvent native_event)
-    : LocatedEvent(native_event) {
-}
-
-MouseEvent::MouseEvent(NativeEvent2 native_event_2,
-                       FromNativeEvent2 from_native)
-    : LocatedEvent(native_event_2, from_native) {
-  // No one should ever call this on Windows.
-  // TODO(msw): remove once we rid views of Gtk/Gdk.
-  NOTREACHED();
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
 
-MouseWheelEvent::MouseWheelEvent(NativeEvent native_event)
+MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(0 /* TODO(beng): obtain */) {
 }
 
-MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2,
-                                 FromNativeEvent2 from_native)
-    : MouseEvent(native_event_2, from_native) {
-  // No one should ever call this on Windows.
-  // TODO(msw): remove once we rid views of Gtk/Gdk.
-  NOTREACHED();
-}
-
 }  // namespace views