Consolidate ui::NativeEvent and base::NativeEvent

views/events/event.h

 // 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.
 
 #ifndef VIEWS_EVENTS_EVENT_H_
 #define VIEWS_EVENTS_EVENT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/time.h"
@@ skipping 15 matching lines @@
 // TODO(msw): Remove GTK support from views event code when possible.
 #if defined(TOOLKIT_USES_GTK)
 typedef union _GdkEvent GdkEvent;
 #endif
 
 namespace views {
 
 #if defined(USE_AURA)
 typedef aura::Event* NativeEvent;
 #else
-typedef ui::NativeEvent NativeEvent;
+typedef base::NativeEvent NativeEvent;
 #endif
 
 class View;
 
 namespace internal {
 class NativeWidgetView;
 class RootView;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 189 matching lines @@
 //
 // TouchEvent class
 //
 // A touch event is generated by touch screen and advanced track
 // pad devices. There is a deliberate direct correspondence between
 // TouchEvent and PlatformTouchPoint.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT TouchEvent : public LocatedEvent {
  public:
-  explicit TouchEvent(const NativeEvent& native_event);
+  explicit TouchEvent(const base::NativeEvent& native_event);
 
   // Create a new touch event.
   TouchEvent(ui::EventType type,
              int x,
              int y,
              int flags,
              int touch_id,
              float radius_x,
              float radius_y,
              float angle,
@@ skipping 173 matching lines @@
 
   // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
   int source_operations_;
 
   DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_EVENTS_EVENT_H_