Convert Aura to use ui::Event.

ash/display/mouse_cursor_event_filter.cc

Index: ash/display/mouse_cursor_event_filter.cc
===================================================================
--- ash/display/mouse_cursor_event_filter.cc	(revision 150582)
+++ ash/display/mouse_cursor_event_filter.cc	(working copy)
@@ -8,9 +8,9 @@
 #include "ash/shell.h"
 #include "ash/wm/cursor_manager.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/base/event.h"
 
 namespace ash {
 namespace internal {
@@ -25,12 +25,12 @@
 }
 
 bool MouseCursorEventFilter::PreHandleKeyEvent(aura::Window* target,
-                                               aura::KeyEvent* event) {
+                                               ui::KeyEvent* event) {
   return false;
 }
 
 bool MouseCursorEventFilter::PreHandleMouseEvent(aura::Window* target,
-                                                 aura::MouseEvent* event) {
+                                                 ui::MouseEvent* event) {
   // Handle both MOVED and DRAGGED events here because when the mouse pointer
   // enters the other root window while dragging, the underlying window system
   // (at least X11) stops generating a ui::ET_MOUSE_MOVED event.
@@ -41,20 +41,20 @@
 
   aura::RootWindow* current_root = target->GetRootWindow();
   gfx::Point location_in_root(event->location());
-  aura::Window::ConvertPointToWindow(target, current_root, &location_in_root);
+  aura::Window::ConvertPointToTarget(target, current_root, &location_in_root);
   return display_controller_->WarpMouseCursorIfNecessary(
       current_root, location_in_root);
 }
 
 ui::TouchStatus MouseCursorEventFilter::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus MouseCursorEventFilter::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }