Convert Aura to use ui::Event.

ash/wm/app_list_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_APP_LIST_CONTROLLER_H_
 #define ASH_WM_APP_LIST_CONTROLLER_H_
 
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/shell_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/timer.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/focus_change_observer.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class AppListView;
 class PaginationModel;
 }
 
-namespace aura {
+namespace ui {
 class LocatedEvent;
 }
 
 namespace ash {
 namespace internal {
 
 // AppListController is a controller that manages app list UI for shell.
 // It creates AppListView and schedules showing/hiding animation.
 // While the UI is visible, it monitors things such as app list widget's
 // activation state and desktop mouse click to auto dismiss the UI.
@@ skipping 26 matching lines @@
   // Otherwise, we just close it.
   void SetView(app_list::AppListView* view);
 
   // Forgets the view.
   void ResetView();
 
   // Starts show/hide animation.
   void ScheduleAnimation();
 
   void ProcessLocatedEvent(aura::Window* target,
-                           const aura::LocatedEvent& event);
+                           const ui::LocatedEvent& event);
 
   // Makes app list bubble update its bounds.
   void UpdateBounds();
 
   // aura::EventFilter overrides:
   virtual bool PreHandleKeyEvent(aura::Window* target,
-                                 aura::KeyEvent* event) OVERRIDE;
+                                 ui::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(aura::Window* target,
-                                   aura::MouseEvent* event) OVERRIDE;
-  virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
-                                              aura::TouchEvent* event) OVERRIDE;
+                                   ui::MouseEvent* event) OVERRIDE;
+  virtual ui::TouchStatus PreHandleTouchEvent(
+      aura::Window* target,
+      ui::TouchEventImpl* event) OVERRIDE;
   virtual ui::GestureStatus PreHandleGestureEvent(
       aura::Window* target,
-      aura::GestureEvent* event) OVERRIDE;
+      ui::GestureEventImpl* event) OVERRIDE;
 
   // aura::FocusChangeObserver overrides:
   virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
 
   // aura::RootWindowObserver overrides:
   virtual void OnRootWindowResized(const aura::RootWindow* root,
                                    const gfx::Size& old_size) OVERRIDE;
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
@@ skipping 15 matching lines @@
   // The AppListView this class manages, owned by its widget.
   app_list::AppListView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_APP_LIST_CONTROLLER_H_