Convert Aura to use ui::Event.

ui/views/widget/native_widget_aura.cc

Index: ui/views/widget/native_widget_aura.cc
===================================================================
--- ui/views/widget/native_widget_aura.cc	(revision 150582)
+++ ui/views/widget/native_widget_aura.cc	(working copy)
@@ -16,11 +16,11 @@
 #include "ui/aura/client/window_move_client.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/event.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer.h"
@@ -387,7 +387,7 @@
 
   // Convert the bounds back relative to the parent.
   gfx::Point origin = window_bounds.origin();
-  aura::Window::ConvertPointToWindow(window_->GetRootWindow(),
+  aura::Window::ConvertPointToTarget(window_->GetRootWindow(),
       window_->parent(), &origin);
   window_bounds.set_origin(origin);
   window_->SetBounds(window_bounds);
@@ -734,7 +734,7 @@
   delegate_->OnNativeBlur(window_->GetFocusManager()->GetFocusedWindow());
 }
 
-bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) {
+bool NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
   if (event->is_char()) {
     // If a ui::InputMethod object is attached to the root window, character
     // events are handled inside the object and are not passed to this function.
@@ -791,14 +791,14 @@
   return true;
 }
 
-bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) {
+bool NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
   DCHECK(window_->IsVisible());
   if (event->type() == ui::ET_MOUSEWHEEL) {
     MouseWheelEvent wheel_event(event);
     return delegate_->OnMouseEvent(wheel_event);
   }
   if (event->type() == ui::ET_SCROLL) {
-    ScrollEvent scroll_event(static_cast<aura::ScrollEvent*>(event));
+    ScrollEvent scroll_event(static_cast<ui::ScrollEvent*>(event));
     if (delegate_->OnMouseEvent(scroll_event))
       return true;
 
@@ -812,13 +812,14 @@
   return delegate_->OnMouseEvent(mouse_event);
 }
 
-ui::TouchStatus NativeWidgetAura::OnTouchEvent(aura::TouchEvent* event) {
+ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEventImpl* event) {
   DCHECK(window_->IsVisible());
   TouchEvent touch_event(event);
   return delegate_->OnTouchEvent(touch_event);
 }
 
-ui::GestureStatus NativeWidgetAura::OnGestureEvent(aura::GestureEvent* event) {
+ui::GestureStatus NativeWidgetAura::OnGestureEvent(
+    ui::GestureEventImpl* event) {
   DCHECK(window_->IsVisible());
   GestureEvent gesture_event(event);
   return delegate_->OnGestureEvent(gesture_event);
@@ -871,7 +872,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::ActivationDelegate implementation:
 
-bool NativeWidgetAura::ShouldActivate(const aura::Event* event) {
+bool NativeWidgetAura::ShouldActivate(const ui::Event* event) {
   return can_activate_ && delegate_->CanActivate();
 }
 
@@ -894,13 +895,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::WindowDragDropDelegate implementation:
 
-void NativeWidgetAura::OnDragEntered(const aura::DropTargetEvent& event) {
+void NativeWidgetAura::OnDragEntered(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   last_drop_operation_ = drop_helper_->OnDragOver(event.data(),
       event.location(), event.source_operations());
 }
 
-int NativeWidgetAura::OnDragUpdated(const aura::DropTargetEvent& event) {
+int NativeWidgetAura::OnDragUpdated(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   last_drop_operation_ = drop_helper_->OnDragOver(event.data(),
       event.location(), event.source_operations());
@@ -912,7 +913,7 @@
   drop_helper_->OnDragExit();
 }
 
-int NativeWidgetAura::OnPerformDrop(const aura::DropTargetEvent& event) {
+int NativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   return drop_helper_->OnDrop(event.data(), event.location(),
       last_drop_operation_);