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

Unified Diff: ui/views/controls/slider.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/slider.h ('k') | ui/views/controls/textfield/native_textfield_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/slider.cc
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index ab3d5886b8af7d2f635d463e1ed7072990951347..890a28f606da6849c9f2257ae7673a46d554f698 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -261,15 +261,15 @@ bool Slider::OnKeyPressed(const ui::KeyEvent& event) {
return false;
}
-ui::GestureStatus Slider::OnGestureEvent(const ui::GestureEvent& event) {
+ui::EventResult Slider::OnGestureEvent(const ui::GestureEvent& event) {
if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE ||
event.type() == ui::ET_GESTURE_SCROLL_BEGIN ||
event.type() == ui::ET_GESTURE_SCROLL_END ||
event.type() == ui::ET_GESTURE_TAP_DOWN) {
MoveButtonTo(event.location());
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
void Slider::AnimationProgressed(const ui::Animation* animation) {
« no previous file with comments | « ui/views/controls/slider.h ('k') | ui/views/controls/textfield/native_textfield_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698