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

Unified Diff: ui/views/controls/scroll_view.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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/views/controls/scroll_view.h ('k') | ui/views/controls/scrollbar/base_scroll_bar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/scroll_view.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index 2e8e5a0b2738df0fd381fb881b815bb1f9670f83..013e5850f84bbdde9cb569820cf63d7503cb4395 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -400,8 +400,8 @@ bool ScrollView::OnKeyPressed(const ui::KeyEvent& event) {
return processed;
}
-ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
- ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
+ui::EventResult ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
+ ui::EventResult status = ui::ER_UNHANDLED;
// If the event happened on one of the scrollbars, then those events are
// sent directly to the scrollbars. Otherwise, only scroll events are sent to
@@ -415,7 +415,7 @@ ui::GestureStatus ScrollView::OnGestureEvent(const ui::GestureEvent& event) {
if (vert_sb_->bounds().Contains(event.location()) || scroll_event)
status = vert_sb_->OnGestureEvent(event);
}
- if (status == ui::GESTURE_STATUS_UNKNOWN && horiz_sb_->visible()) {
+ if (status == ui::ER_UNHANDLED && horiz_sb_->visible()) {
if (horiz_sb_->bounds().Contains(event.location()) || scroll_event)
status = horiz_sb_->OnGestureEvent(event);
}
« no previous file with comments | « ui/views/controls/scroll_view.h ('k') | ui/views/controls/scrollbar/base_scroll_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698