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

Unified Diff: ui/views/color_chooser/color_chooser_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/base/events/event_handler.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/color_chooser/color_chooser_view.cc
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
index cb99d071829ec4c299a3f32df185f7e7e85c3d70..dc35ff1a74ea9124506668c6f66fe7cf2d3c4ade 100644
--- a/ui/views/color_chooser/color_chooser_view.cc
+++ b/ui/views/color_chooser/color_chooser_view.cc
@@ -73,15 +73,15 @@ class LocatedEventHandlerView : public views::View {
return true;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
const ui::GestureEvent& event) OVERRIDE {
if (event.type() == ui::ET_GESTURE_TAP ||
event.type() == ui::ET_GESTURE_TAP_DOWN ||
event.IsScrollGestureEvent()) {
ProcessEventAtLocation(event.location());
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
DISALLOW_COPY_AND_ASSIGN(LocatedEventHandlerView);
« no previous file with comments | « ui/base/events/event_handler.h ('k') | ui/views/controls/button/custom_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698