Convert Aura to use ui::Event.

http://crbug.com/125937
TEST=existing
Review URL: https://chromiumcodereview.appspot.com/10827145

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150587 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
index 668271b..3685d79 100644
--- a/ash/wm/activation_controller.cc
+++ b/ash/wm/activation_controller.cc
@@ -85,7 +85,7 @@ bool VisibilityMatches(aura::Window* window, ActivateVisibilityType type) {
 // A window manager typically defines some notion of "top level window" that
 // supports activation/deactivation.
 bool CanActivateWindowWithEvent(aura::Window* window,
-                                const aura::Event* event,
+                                const ui::Event* event,
                                 ActivateVisibilityType visibility_type) {
   return window &&
       VisibilityMatches(window, visibility_type) &&
@@ -130,7 +130,7 @@ ActivationController::~ActivationController() {
 // static
 aura::Window* ActivationController::GetActivatableWindow(
     aura::Window* window,
-    const aura::Event* event) {
+    const ui::Event* event) {
   aura::Window* parent = window->parent();
   aura::Window* child = window;
   while (parent) {
@@ -178,7 +178,7 @@ aura::Window* ActivationController::GetActiveWindow() {
 }
 
 bool ActivationController::OnWillFocusWindow(aura::Window* window,
-                                             const aura::Event* event) {
+                                             const ui::Event* event) {
   return CanActivateWindowWithEvent(
       GetActivatableWindow(window, event), event, CURRENT_VISIBILITY);
 }
@@ -230,7 +230,7 @@ void ActivationController::OnWindowFocused(aura::Window* window) {
 // ActivationController, private:
 
 void ActivationController::ActivateWindowWithEvent(aura::Window* window,
-                                                   const aura::Event* event) {
+                                                   const ui::Event* event) {
   aura::Window* window_modal_transient = wm::GetWindowModalTransient(window);
   if (window_modal_transient) {
     ActivateWindow(window_modal_transient);