| Index: ash/wm/user_activity_detector.h
|
| diff --git a/ash/wm/user_activity_detector.h b/ash/wm/user_activity_detector.h
|
| index b28b9ecdc0d61a0ad7142316f5e40e941e6fee18..89a2518a05341932bb304393b6154901d20a4c57 100644
|
| --- a/ash/wm/user_activity_detector.h
|
| +++ b/ash/wm/user_activity_detector.h
|
| @@ -37,8 +37,8 @@ class ASH_EXPORT UserActivityDetector : public ui::EventHandler {
|
| // ui::EventHandler implementation.
|
| virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| - virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| - virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| + virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
| private:
|
|
|