events: Change gesture-event handler in EventHandler to not return any values.

ui/views/view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 216 matching lines @@
 
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
 
   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;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
   // MouseEvent.
@@ skipping 32 matching lines @@
   virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
 };
 
 // A view subclass that consumes all Gesture events for testing purposes.
 class TestViewConsumeGesture : public TestView {
  public:
   TestViewConsumeGesture() : 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:
   DISALLOW_COPY_AND_ASSIGN(TestViewConsumeGesture);
 };
 
 // A view subclass that ignores all Gesture events.
 class TestViewIgnoreGesture: public TestView {
  public:
   TestViewIgnoreGesture() : 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);
 };
 
 // A view subclass that ignores all scroll-gesture events, but consume all other
 // gesture events.
 class TestViewIgnoreScrollGestures : public TestViewConsumeGesture {
  public:
   TestViewIgnoreScrollGestures() {}
   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);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // OnBoundsChanged
 ////////////////////////////////////////////////////////////////////////////////
 
 void TestView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
@@ skipping 251 matching lines @@
   root->DispatchTouchEvent(&released);
   EXPECT_EQ(v2->last_touch_event_type_, ui::ET_TOUCH_RELEASED);
   EXPECT_EQ(v2->location_.x(), -100);
   EXPECT_EQ(v2->location_.y(), -100);
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_touch_event_type_, 0);
 
   widget->CloseNow();
 }
 
-ui::EventResult TestView::OnGestureEvent(ui::GestureEvent* event) {
-  return ui::ER_UNHANDLED;
+void TestView::OnGestureEvent(ui::GestureEvent* event) {
 }
 
 TEST_F(ViewTest, GestureEvent) {
   // Views hierarchy for non delivery of GestureEvent.
   TestView* v1 = new TestViewConsumeGesture();
   v1->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
 
   TestView* v2 = new TestViewConsumeGesture();
   v2->SetBoundsRect(gfx::Rect(100, 100, 100, 100));
 
@@ skipping 2782 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views