Replace views::Event with ui::Event.

ui/views/events/event.cc

 // Copyright (c) 2012 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 "ui/views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
-// Event, protected:
-
-Event::Event(ui::EventType type, int flags)
-    : type_(type),
-      time_stamp_(base::Time::NowFromSystemTime()),
-      flags_(flags) {
-  // Safely initialize the pointer/struct to null/empty.
-  memset(&native_event_, 0, sizeof(native_event_));
-}
-
-Event::Event(const NativeEvent& native_event, ui::EventType type, int flags)
-    : native_event_(native_event),
-      type_(type),
-      time_stamp_(base::Time::NowFromSystemTime()),
-      flags_(flags) {
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // LocatedEvent, protected:
 
 #if !defined(USE_AURA)
-LocatedEvent::LocatedEvent(const NativeEvent& native_event)
+LocatedEvent::LocatedEvent(const ui::NativeEvent& native_event)
     : Event(native_event,
             ui::EventTypeFromNative(native_event),
             ui::EventFlagsFromNative(native_event)),
       location_(ui::EventLocationFromNative(native_event)) {
 }
 #endif
 
 // TODO(msw): Kill this legacy constructor when we update uses.
 LocatedEvent::LocatedEvent(ui::EventType type,
                            const gfx::Point& location,
@@ skipping 13 matching lines @@
 
 LocatedEvent::LocatedEvent(const LocatedEvent& model, View* root)
     : Event(model),
       location_(model.location_) {
   View::ConvertPointFromWidget(root, &location_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseEvent, public:
 
-MouseEvent::MouseEvent(const NativeEvent& native_event)
+MouseEvent::MouseEvent(const ui::NativeEvent& native_event)
     : LocatedEvent(native_event) {
 }
 
 MouseEvent::MouseEvent(const MouseEvent& model, View* source, View* target)
     : LocatedEvent(model, source, target) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent, public:
 
 #if !defined(USE_AURA)
-MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
+MouseWheelEvent::MouseWheelEvent(const ui::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(ui::GetMouseWheelOffset(native_event)) {
 }
 #endif
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
-    : MouseEvent(scroll_event.native_event()),
+    : MouseEvent(scroll_event),
       offset_(scroll_event.y_offset()) {
   set_type(ui::ET_MOUSEWHEEL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
 TouchEvent::TouchEvent(ui::EventType type,
                        int x,
                        int y,
@@ skipping 73 matching lines @@
 }
 
 GestureEventForTest::GestureEventForTest(ui::EventType type,
                                          int x,
                                          int y,
                                          int flags)
     : GestureEvent(type, x, y, flags) {
 }
 
 }  // namespace views