Convert Aura to use ui::Event.

ash/wm/activation_controller.h

 // 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.
 
 #ifndef ASH_WM_ACTIVATION_CONTROLLER_H_
 #define ASH_WM_ACTIVATION_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
@@ skipping 20 matching lines @@
       public aura::EnvObserver,
       public aura::FocusChangeObserver {
  public:
   explicit ActivationController(aura::FocusManager* focus_manager);
   virtual ~ActivationController();
 
   // Returns true if |window| exists within a container that supports
   // activation. |event| is the revent responsible for initiating the change, or
   // NULL if there is no event.
   static aura::Window* GetActivatableWindow(aura::Window* window,
-                                            const aura::Event* event);
+                                            const ui::Event* event);
 
   // Overridden from aura::client::ActivationClient:
   virtual void AddObserver(
       aura::client::ActivationChangeObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
       aura::client::ActivationChangeObserver* observer) OVERRIDE;
   virtual void ActivateWindow(aura::Window* window) OVERRIDE;
   virtual void DeactivateWindow(aura::Window* window) OVERRIDE;
   virtual aura::Window* GetActiveWindow() OVERRIDE;
   virtual bool OnWillFocusWindow(aura::Window* window,
-                                 const aura::Event* event) OVERRIDE;
+                                 const ui::Event* event) OVERRIDE;
   virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowVisibilityChanged(aura::Window* window,
                                          bool visible) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // Overridden from aura::EnvObserver:
   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
 
   // Overridden from aura::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
 
  private:
   // Implementation of ActivateWindow() with an Event.
   void ActivateWindowWithEvent(aura::Window* window,
-                               const aura::Event* event);
+                               const ui::Event* event);
 
   // Shifts activation to the next window, ignoring |window|. Returns the next
   // window.
   aura::Window* ActivateNextWindow(aura::Window* window);
 
   // Returns the next window that should be activated, ignoring |ignore|.
   aura::Window* GetTopmostWindowToActivate(aura::Window* ignore) const;
 
   // Returns the next window that should be activated in |container| ignoring
   // the window |ignore|.
@@ skipping 13 matching lines @@
 
   ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivationController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_ACTIVATION_CONTROLLER_H_