Convert Aura to use ui::Event.

ash/wm/user_activity_detector.cc

 // Copyright (c) 2012 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.
 
 #include "ash/wm/user_activity_detector.h"
 
 #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 {
 
 const double UserActivityDetector::kNotifyIntervalSec = 1.0;
 
 UserActivityDetector::UserActivityDetector() {
 }
 
 UserActivityDetector::~UserActivityDetector() {
 }
 
 void UserActivityDetector::AddObserver(UserActivityObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void UserActivityDetector::RemoveObserver(UserActivityObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 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()))
     return true;
   MaybeNotify();
   return false;
 }
 
 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))
     MaybeNotify();
   return false;
 }
 
 ui::TouchStatus UserActivityDetector::PreHandleTouchEvent(
     aura::Window* target,
-    aura::TouchEvent* event) {
+    ui::TouchEventImpl* event) {
   if (!GetRootWindowController(target->GetRootWindow()))
     return ui::TOUCH_STATUS_END;
   MaybeNotify();
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus UserActivityDetector::PreHandleGestureEvent(
     aura::Window* target,
-    aura::GestureEvent* event) {
+    ui::GestureEventImpl* event) {
   if (!GetRootWindowController(target->GetRootWindow()))
     return ui::GESTURE_STATUS_CONSUMED;
   MaybeNotify();
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 void UserActivityDetector::MaybeNotify() {
   base::TimeTicks now =
       !now_for_test_.is_null() ? now_for_test_ : base::TimeTicks::Now();
   if (last_observer_notification_time_.is_null() ||
       (now - last_observer_notification_time_).InSecondsF() >=
       kNotifyIntervalSec) {
     FOR_EACH_OBSERVER(UserActivityObserver, observers_, OnUserActivity());
     last_observer_notification_time_ = now;
   }
 }
 
 }  // namespace ash