| Index: ash/tooltips/tooltip_controller.h
|
| ===================================================================
|
| --- ash/tooltips/tooltip_controller.h (revision 150582)
|
| +++ ash/tooltips/tooltip_controller.h (working copy)
|
| @@ -15,9 +15,6 @@
|
| #include "ui/gfx/point.h"
|
|
|
| namespace aura {
|
| -class KeyEvent;
|
| -class MouseEvent;
|
| -class TouchEvent;
|
| class Window;
|
| namespace client {
|
| class DragDropClient;
|
| @@ -46,13 +43,14 @@
|
|
|
| // Overridden from aura::EventFilter.
|
| 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;
|
|
|
| // Overridden from aura::WindowObserver.
|
| virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
|
|
|