Convert Aura to use ui::Event.

ash/wm/toplevel_window_event_filter.cc

Index: ash/wm/toplevel_window_event_filter.cc
===================================================================
--- ash/wm/toplevel_window_event_filter.cc	(revision 150582)
+++ ash/wm/toplevel_window_event_filter.cc	(working copy)
@@ -15,11 +15,11 @@
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
-#include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/base/event.h"
 #include "ui/base/gestures/gesture_recognizer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
@@ -39,7 +39,7 @@
 gfx::Point ConvertPointToParent(aura::Window* window,
                                 const gfx::Point& point) {
   gfx::Point result(point);
-  aura::Window::ConvertPointToWindow(window, window->parent(), &result);
+  aura::Window::ConvertPointToTarget(window, window->parent(), &result);
   return result;
 }
 
@@ -56,7 +56,7 @@
 }
 
 bool ToplevelWindowEventFilter::PreHandleKeyEvent(aura::Window* target,
-                                                  aura::KeyEvent* event) {
+                                                  ui::KeyEvent* event) {
   if (window_resizer_.get() && event->type() == ui::ET_KEY_PRESSED &&
       event->key_code() == ui::VKEY_ESCAPE) {
     CompleteDrag(DRAG_REVERT, event->flags());
@@ -65,7 +65,7 @@
 }
 
 bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target,
-                                                    aura::MouseEvent* event) {
+                                                    ui::MouseEvent* event) {
   if ((event->flags() &
       (ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON)) != 0)
     return false;
@@ -120,13 +120,13 @@
 
 ui::TouchStatus ToplevelWindowEventFilter::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus ToplevelWindowEventFilter::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN: {
       int component =
@@ -210,7 +210,7 @@
     DCHECK(has_point);
   } else {
     drag_location = root_window->GetLastMouseLocationInRoot();
-    aura::Window::ConvertPointToWindow(
+    aura::Window::ConvertPointToTarget(
         root_window, source->parent(), &drag_location);
   }
   window_resizer_.reset(
@@ -261,7 +261,7 @@
 }
 
 bool ToplevelWindowEventFilter::HandleDrag(aura::Window* target,
-                                           aura::LocatedEvent* event) {
+                                           ui::LocatedEvent* event) {
   // This function only be triggered to move window
   // by mouse drag or touch move event.
   DCHECK(event->type() == ui::ET_MOUSE_DRAGGED ||
@@ -276,7 +276,7 @@
 }
 
 bool ToplevelWindowEventFilter::HandleMouseMoved(aura::Window* target,
-                                                 aura::LocatedEvent* event) {
+                                                 ui::LocatedEvent* event) {
   // TODO(jamescook): Move the resize cursor update code into here from
   // CompoundEventFilter?
   internal::ResizeShadowController* controller =
@@ -294,7 +294,7 @@
 }
 
 bool ToplevelWindowEventFilter::HandleMouseExited(aura::Window* target,
-                                                  aura::LocatedEvent* event) {
+                                                  ui::LocatedEvent* event) {
   internal::ResizeShadowController* controller =
       Shell::GetInstance()->resize_shadow_controller();
   if (controller)