| Index: ash/tooltips/tooltip_controller.h
|
| diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
|
| index 32ef3ff28b00277f333e69e8c12c5cabd9e0bf8d..08b2f12d6e74eadb3d0e5f8ba2f5578287b4dee1 100644
|
| --- a/ash/tooltips/tooltip_controller.h
|
| +++ b/ash/tooltips/tooltip_controller.h
|
| @@ -46,7 +46,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
|
| 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(aura::Window* target,
|
|
|