Index: ash/wm/app_list_controller.h |
=================================================================== |
--- ash/wm/app_list_controller.h (revision 150582) |
+++ ash/wm/app_list_controller.h (working copy) |
@@ -21,7 +21,7 @@ |
class PaginationModel; |
} |
-namespace aura { |
+namespace ui { |
class LocatedEvent; |
} |
@@ -68,21 +68,22 @@ |
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; |