events: Update scroll and touch handlers to not return EventResult.

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 214 matching lines @@
     accelerator_count_map_.clear();
   }
 
   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;
+  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
   // Ignores GestureEvent by default.
   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_;
@@ skipping 24 matching lines @@
   std::map<ui::Accelerator, int> accelerator_count_map_;
 };
 
 // A view subclass that ignores all touch events for testing purposes.
 class TestViewIgnoreTouch : public TestView {
  public:
   TestViewIgnoreTouch() : TestView() {}
   virtual ~TestViewIgnoreTouch() {}
 
  private:
-  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  virtual void 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 void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
@@ skipping 176 matching lines @@
                          ui::EF_LEFT_MOUSE_BUTTON);
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->child_count());
 
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent
 ////////////////////////////////////////////////////////////////////////////////
-ui::EventResult TestView::OnTouchEvent(ui::TouchEvent* event) {
+void TestView::OnTouchEvent(ui::TouchEvent* event) {
   last_touch_event_type_ = event->type();
   location_.SetPoint(event->x(), event->y());
   if (!in_touch_sequence_) {
     if (event->type() == ui::ET_TOUCH_PRESSED) {
       in_touch_sequence_ = true;
-      return ui::ER_CONSUMED;
+      event->StopPropagation();
+      return;
     }
   } else {
     if (event->type() == ui::ET_TOUCH_RELEASED) {
       in_touch_sequence_ = false;
-      return ui::ER_HANDLED;
+      event->SetHandled();
+      return;
     }
-    return ui::ER_CONSUMED;
+    event->StopPropagation();
+    return;
   }
-  return last_touch_event_was_handled_ ? ui::ER_CONSUMED :
-                                         ui::ER_UNHANDLED;
+
+  if (last_touch_event_was_handled_)
+   event->StopPropagation();
 }
 
-ui::EventResult TestViewIgnoreTouch::OnTouchEvent(ui::TouchEvent* event) {
-  return ui::ER_UNHANDLED;
+void TestViewIgnoreTouch::OnTouchEvent(ui::TouchEvent* event) {
 }
 
 TEST_F(ViewTest, TouchEvent) {
   TestView* v1 = new TestView();
   v1->SetBoundsRect(gfx::Rect(0, 0, 300, 300));
 
   TestView* v2 = new TestView();
   v2->SetBoundsRect(gfx::Rect(100, 100, 100, 100));
 
   TestView* v3 = new TestViewIgnoreTouch();
@@ skipping 2893 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