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

Unified Diff: ui/views/widget/native_widget_aura_unittest.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/widget/native_widget_aura.cc ('k') | ui/views/widget/native_widget_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura_unittest.cc
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index 594ebb382ec493c710f83ac2c3acca7226318c1d..b61fa3e37bacac36643fb3fcf3b51c1fa620dad4 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -216,11 +216,11 @@ class GestureTrackingView : public views::View {
}
// View overrides:
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
const ui::GestureEvent& event) OVERRIDE {
got_gesture_event_ = true;
- return consume_gesture_event_ ? ui::GESTURE_STATUS_CONSUMED :
- ui::GESTURE_STATUS_UNKNOWN;
+ return consume_gesture_event_ ? ui::ER_CONSUMED :
+ ui::ER_UNHANDLED;
}
private:
« no previous file with comments | « ui/views/widget/native_widget_aura.cc ('k') | ui/views/widget/native_widget_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698