Index: ash/launcher/launcher_tooltip_manager.h |
=================================================================== |
--- ash/launcher/launcher_tooltip_manager.h (revision 150582) |
+++ ash/launcher/launcher_tooltip_manager.h (working copy) |
@@ -72,14 +72,15 @@ |
protected: |
// 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; |
// ShelfLayoutManager::Observer overrides: |
virtual void WillDeleteShelf() OVERRIDE; |