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

Unified Diff: ui/views/controls/textfield/native_textfield_views.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/textfield/native_textfield_views.h ('k') | ui/views/view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/native_textfield_views.cc
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index c1afcea3a68cc4260e4362e2a0a179ad561272ca..058293f2dc3800d7311bd0261cce9f3c161c223a 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -146,10 +146,10 @@ void NativeTextfieldViews::OnMouseReleased(const ui::MouseEvent& event) {
OnAfterUserAction();
}
-ui::GestureStatus NativeTextfieldViews::OnGestureEvent(
+ui::EventResult NativeTextfieldViews::OnGestureEvent(
const ui::GestureEvent& event) {
- ui::GestureStatus status = textfield_->OnGestureEvent(event);
- if (status != ui::GESTURE_STATUS_UNKNOWN)
+ ui::EventResult status = textfield_->OnGestureEvent(event);
+ if (status != ui::ER_UNHANDLED)
return status;
switch (event.type()) {
@@ -162,16 +162,16 @@ ui::GestureStatus NativeTextfieldViews::OnGestureEvent(
MoveCursorTo(event.location(), false))
SchedulePaint();
OnAfterUserAction();
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
case ui::ET_GESTURE_DOUBLE_TAP:
SelectAll(false);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
case ui::ET_GESTURE_SCROLL_UPDATE:
OnBeforeUserAction();
if (MoveCursorTo(event.location(), true))
SchedulePaint();
OnAfterUserAction();
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
default:
break;
}
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.h ('k') | ui/views/view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698