| Index: ash/wm/user_activity_detector.h
|
| diff --git a/ash/wm/user_activity_detector.h b/ash/wm/user_activity_detector.h
|
| index c07f4ea4e5f65c6b23ddabbae2cc6179a0fcd425..3bf65168db0af04730286c93308aac80264504cc 100644
|
| --- a/ash/wm/user_activity_detector.h
|
| +++ b/ash/wm/user_activity_detector.h
|
| @@ -42,7 +42,7 @@ class ASH_EXPORT UserActivityDetector : public aura::EventFilter {
|
| virtual ui::TouchStatus PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) OVERRIDE;
|
|
|
|
|