Consolidate/cleanup event cracking code; single out GdkEvents.

views/events/event_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/aura/event.h"
 
 namespace views {
 
 namespace {
 
-int GetKeyStateFlags() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-ui::EventType EventTypeFromNative(NativeEvent native_event) {
+ui::EventType EventTypeFromNative(const views::NativeEvent& native_event) {
   return native_event->type();
 }
 
-int EventFlagsFromNative(NativeEvent native_event) {
+int EventFlagsFromNative(const views::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;
 }
 
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // 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;
@@ skipping 20 matching lines @@
     : 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()),
+    : 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();
@@ skipping 34 matching lines @@
 
 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