| Index: ui/wm/core/user_activity_detector.h
|
| diff --git a/ui/wm/core/user_activity_detector.h b/ui/wm/core/user_activity_detector.h
|
| index 851f07ac325d7323791f3564ed8622c41260ca0a..7e5db9fce1ca833e19f8eab959479bb4b6d0730b 100644
|
| --- a/ui/wm/core/user_activity_detector.h
|
| +++ b/ui/wm/core/user_activity_detector.h
|
| @@ -41,11 +41,11 @@ class WM_EXPORT UserActivityDetector : public ui::EventHandler {
|
| void OnDisplayPowerChanging();
|
|
|
| // ui::EventHandler implementation.
|
| - virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnKeyEvent(ui::KeyEvent* event) override;
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| + virtual void OnScrollEvent(ui::ScrollEvent* event) override;
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) override;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| private:
|
| // Returns |now_for_test_| if set or base::TimeTicks::Now() otherwise.
|
|
|