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

Unified Diff: ui/aura/window_unittest.cc

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/test/test_window_delegate.cc ('k') | ui/base/events/event.cc » ('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 4dde778a3379ea4e01ea5002c0a3d846317dc4ae..08a4a429db26c0be2bad8bd522fd734edd670058 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -180,10 +180,8 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate {
touch_event_count_++;
return ui::ER_UNHANDLED;
}
- virtual ui::EventResult OnGestureEvent(
- ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
gesture_event_count_++;
- return ui::ER_UNHANDLED;
}
virtual void OnCaptureLost() OVERRIDE {
capture_lost_count_++;
@@ -223,10 +221,9 @@ class GestureTrackPositionDelegate : public TestWindowDelegate {
public:
GestureTrackPositionDelegate() {}
- virtual ui::EventResult OnGestureEvent(
- ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
position_ = event->location();
- return ui::ER_CONSUMED;
+ event->StopPropagation();
}
const gfx::Point& position() const { return position_; }
« no previous file with comments | « ui/aura/test/test_window_delegate.cc ('k') | ui/base/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698