| 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 7e5db9fce1ca833e19f8eab959479bb4b6d0730b..0b92bc3b7c38c9888451a5675f33d56debfc909b 100644
|
| --- a/ui/wm/core/user_activity_detector.h
|
| +++ b/ui/wm/core/user_activity_detector.h
|
| @@ -27,7 +27,7 @@ class WM_EXPORT UserActivityDetector : public ui::EventHandler {
|
| static const int kDisplayPowerChangeIgnoreMouseMs;
|
|
|
| UserActivityDetector();
|
| - virtual ~UserActivityDetector();
|
| + ~UserActivityDetector() override;
|
|
|
| base::TimeTicks last_activity_time() const { return last_activity_time_; }
|
|
|
| @@ -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;
|
| + void OnKeyEvent(ui::KeyEvent* event) override;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnScrollEvent(ui::ScrollEvent* event) override;
|
| + void OnTouchEvent(ui::TouchEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| private:
|
| // Returns |now_for_test_| if set or base::TimeTicks::Now() otherwise.
|
|
|