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

Unified Diff: ui/aura/window_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/aura/window_delegate.cc ('k') | ui/base/events.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 09be9ea088a82ffb9b7a97ca33f35f7940866f0c..b48b723482e3d958ce404bd84a1c04b0562ec5ba 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -175,10 +175,10 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate {
touch_event_count_++;
return ui::TOUCH_STATUS_UNKNOWN;
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
gesture_event_count_++;
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
virtual void OnCaptureLost() OVERRIDE {
capture_lost_count_++;
@@ -218,10 +218,10 @@ class GestureTrackPositionDelegate : public TestWindowDelegate {
public:
GestureTrackPositionDelegate() {}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
ui::GestureEvent* event) OVERRIDE {
position_ = event->location();
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
const gfx::Point& position() const { return position_; }
« no previous file with comments | « ui/aura/window_delegate.cc ('k') | ui/base/events.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698