Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: ui/app_list/contents_view.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/contents_view.h ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/contents_view.cc
diff --git a/ui/app_list/contents_view.cc b/ui/app_list/contents_view.cc
index 6d9a2e86af432af3cee5d3d30c564179e06c2b58..28ab70697f8b0255532465073e8900232002b01d 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
« no previous file with comments | « ui/app_list/contents_view.h ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698