Convert Aura to use ui::Event.

ash/wm/user_activity_detector.cc

Index: ash/wm/user_activity_detector.cc
===================================================================
--- ash/wm/user_activity_detector.cc	(revision 150582)
+++ ash/wm/user_activity_detector.cc	(working copy)
@@ -7,8 +7,8 @@
 #include "ash/wm/property_util.h"
 #include "ash/wm/user_activity_observer.h"
 #include "ash/wm/window_util.h"
-#include "ui/aura/event.h"
 #include "ui/aura/window.h"
+#include "ui/base/event.h"
 
 namespace ash {
 
@@ -29,7 +29,7 @@
 }
 
 bool UserActivityDetector::PreHandleKeyEvent(aura::Window* target,
-                                             aura::KeyEvent* event) {
+                                             ui::KeyEvent* event) {
   // Ignore input events on secondary displays in non extended desktop
   // mode.  Remove this once this mode is gone. crbug.com/135245.
   if (!GetRootWindowController(target->GetRootWindow()))
@@ -39,7 +39,7 @@
 }
 
 bool UserActivityDetector::PreHandleMouseEvent(aura::Window* target,
-                                               aura::MouseEvent* event) {
+                                               ui::MouseEvent* event) {
   if (!GetRootWindowController(target->GetRootWindow()))
     return true;
   if (!(event->flags() & ui::EF_IS_SYNTHESIZED))
@@ -49,7 +49,7 @@
 
 ui::TouchStatus UserActivityDetector::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   if (!GetRootWindowController(target->GetRootWindow()))
     return ui::TOUCH_STATUS_END;
   MaybeNotify();
@@ -58,7 +58,7 @@
 
 ui::GestureStatus UserActivityDetector::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   if (!GetRootWindowController(target->GetRootWindow()))
     return ui::GESTURE_STATUS_CONSUMED;
   MaybeNotify();