| Index: ash/launcher/launcher_tooltip_manager.h
|
| diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
|
| index ed8943ed5fead3efe449dfd367fd0addf984ff12..8bdc61b03a8488f2883dbcc712c05d3d427cb719 100644
|
| --- a/ash/launcher/launcher_tooltip_manager.h
|
| +++ b/ash/launcher/launcher_tooltip_manager.h
|
| @@ -75,7 +75,7 @@ protected:
|
| ui::KeyEvent* event) OVERRIDE;
|
| virtual bool PreHandleMouseEvent(aura::Window* target,
|
| ui::MouseEvent* event) OVERRIDE;
|
| - virtual ui::TouchStatus PreHandleTouchEvent(
|
| + virtual ui::EventResult PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| virtual ui::EventResult PreHandleGestureEvent(
|
|
|