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 /ui/app_list | |
| 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 'ui/app_list')
| -rw-r--r-- | ui/app_list/contents_view.cc | 6 | ||||
| -rw-r--r-- | ui/app_list/contents_view.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/app_list/contents_view.cc b/ui/app_list/contents_view.cc index 6d9a2e8..28ab706 100644 --- a/ui/app_list/contents_view.cc +++ b/ui/app_list/contents_view.cc @@ -219,18 +219,18 @@ void ContentsView::OnGestureEvent(ui::GestureEvent* event) { } } -ui::EventResult ContentsView::OnScrollEvent(ui::ScrollEvent* event) { +void ContentsView::OnScrollEvent(ui::ScrollEvent* event) { if (show_state_ != SHOW_APPS || event->type() == ui::ET_SCROLL_FLING_CANCEL || abs(event->x_offset()) < kMinScrollToSwitchPage) { - return ui::ER_UNHANDLED; + return; } if (!pagination_model_->has_transition()) { pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1, true); } - return ui::ER_HANDLED; + event->SetHandled(); } } // namespace app_list diff --git a/ui/app_list/contents_view.h b/ui/app_list/contents_view.h index 8c283d5..f91cd32 100644 --- a/ui/app_list/contents_view.h +++ b/ui/app_list/contents_view.h @@ -58,7 +58,7 @@ class ContentsView : public views::View { // Overridden from ui::EventHandler: virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; - virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; + virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; ShowState show_state_; PaginationModel* pagination_model_; // Owned by AppListController. |