| Index: ash/wm/user_activity_detector.h
|
| diff --git a/ash/wm/user_activity_detector.h b/ash/wm/user_activity_detector.h
|
| index 8d44d9a0e50bcfa7abea729e53330efa99a9e521..1affe6536bf9485f7ea572164891b7e54092ea19 100644
|
| --- a/ash/wm/user_activity_detector.h
|
| +++ b/ash/wm/user_activity_detector.h
|
| @@ -41,7 +41,7 @@ class ASH_EXPORT UserActivityDetector : public aura::EventFilter {
|
| 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(
|
|
|