diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
| commit | 6f34b4836f777a3c325ded3256b313c030fc3568 (patch) | |
| tree | eae5bf57b0b2fe311894d5da221fc254882d57b9 /ash/wm/user_activity_detector.cc | |
| parent | 4d1e595f9c36f20be4aa2fee6e15a95c650a72a9 (diff) | |
| download | chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.zip chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.gz chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.bz2 | |
events: Update scroll and touch handlers to not return EventResult.
BUG=163618
Review URL: https://codereview.chromium.org/11568006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/user_activity_detector.cc')
| -rw-r--r-- | ash/wm/user_activity_detector.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/wm/user_activity_detector.cc b/ash/wm/user_activity_detector.cc index ee6a2b7..4338acc 100644 --- a/ash/wm/user_activity_detector.cc +++ b/ash/wm/user_activity_detector.cc @@ -48,14 +48,12 @@ ui::EventResult UserActivityDetector::OnMouseEvent(ui::MouseEvent* event) { return ui::ER_UNHANDLED; } -ui::EventResult UserActivityDetector::OnScrollEvent(ui::ScrollEvent* event) { +void UserActivityDetector::OnScrollEvent(ui::ScrollEvent* event) { MaybeNotify(); - return ui::ER_UNHANDLED; } -ui::EventResult UserActivityDetector::OnTouchEvent(ui::TouchEvent* event) { +void UserActivityDetector::OnTouchEvent(ui::TouchEvent* event) { MaybeNotify(); - return ui::ER_UNHANDLED; } void UserActivityDetector::OnGestureEvent(ui::GestureEvent* event) { |