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

Unified Diff: ui/views/view_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/views/view.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 363c9049f3cc82801ee716910f6696830438cbe2..2e0a98bd4de39186f3bd99660e555c002ff79642 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -234,7 +234,7 @@ class TestView : public View {
virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
// Ignores GestureEvent by default.
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
virtual void Paint(gfx::Canvas* canvas) OVERRIDE;
virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
@@ -287,10 +287,10 @@ class TestViewConsumeGesture : public TestView {
virtual ~TestViewConsumeGesture() {}
protected:
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
last_gesture_event_type_ = event->type();
location_.SetPoint(event->x(), event->y());
- return ui::ER_CONSUMED;
+ event->StopPropagation();
}
private:
@@ -304,8 +304,7 @@ class TestViewIgnoreGesture: public TestView {
virtual ~TestViewIgnoreGesture() {}
private:
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
- return ui::ER_UNHANDLED;
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
}
DISALLOW_COPY_AND_ASSIGN(TestViewIgnoreGesture);
@@ -319,10 +318,10 @@ class TestViewIgnoreScrollGestures : public TestViewConsumeGesture {
virtual ~TestViewIgnoreScrollGestures() {}
private:
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
if (event->IsScrollGestureEvent())
- return ui::ER_UNHANDLED;
- return TestViewConsumeGesture::OnGestureEvent(event);
+ return;
+ TestViewConsumeGesture::OnGestureEvent(event);
}
DISALLOW_COPY_AND_ASSIGN(TestViewIgnoreScrollGestures);
@@ -594,8 +593,7 @@ TEST_F(ViewTest, TouchEvent) {
widget->CloseNow();
}
-ui::EventResult TestView::OnGestureEvent(ui::GestureEvent* event) {
- return ui::ER_UNHANDLED;
+void TestView::OnGestureEvent(ui::GestureEvent* event) {
}
TEST_F(ViewTest, GestureEvent) {
« no previous file with comments | « ui/views/view.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698