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

ui/views/controls/scrollbar/base_scroll_bar.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 "ui/views/controls/scrollbar/base_scroll_bar.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 154 matching lines @@
     return true;
   }
   return false;
 }
 
 bool BaseScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) {
   ScrollByContentsOffset(event.offset());
   return true;
 }
 
-ui::EventResult BaseScrollBar::OnGestureEvent(ui::GestureEvent* event) {
+void BaseScrollBar::OnGestureEvent(ui::GestureEvent* event) {
   // If a fling is in progress, then stop the fling for any incoming gesture
   // event (except for the GESTURE_END event that is generated at the end of the
   // fling).
   if (scroll_animator_.get() && scroll_animator_->is_scrolling() &&
       (event->type() != ui::ET_GESTURE_END ||
        event->details().touch_points() > 1)) {
     scroll_animator_->Stop();
   }
 
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     ProcessPressEvent(*event);
-    return ui::ER_CONSUMED;
+    event->SetHandled();
+    return;
   }
 
   if (event->type() == ui::ET_GESTURE_LONG_PRESS) {
     // For a long-press, the repeater started in tap-down should continue. So
     // return early.
-    return ui::ER_UNHANDLED;
+    return;
   }
 
   ResetState();
 
   if (event->type() == ui::ET_GESTURE_TAP) {
     // TAP_DOWN would have already scrolled some amount. So scrolling again on
     // TAP is not necessary.
-    return ui::ER_CONSUMED;
+    event->SetHandled();
+    return;
   }
 
   if (event->type() == ui::ET_GESTURE_SCROLL_BEGIN ||
-      event->type() == ui::ET_GESTURE_SCROLL_END)
-    return ui::ER_CONSUMED;
+      event->type() == ui::ET_GESTURE_SCROLL_END) {
+    event->SetHandled();
+    return;
+  }
 
   if (event->type() == ui::ET_GESTURE_SCROLL_UPDATE) {
     ScrollByContentsOffset(IsHorizontal() ? event->details().scroll_x() :
                                             event->details().scroll_y());
-    return ui::ER_CONSUMED;
+    event->SetHandled();
+    return;
   }
 
   if (event->type() == ui::ET_SCROLL_FLING_START) {
     if (!scroll_animator_.get())
       scroll_animator_.reset(new ScrollAnimator(this));
     scroll_animator_->Start(
         IsHorizontal() ?  event->details().velocity_x() : 0.f,
         IsHorizontal() ? 0.f : event->details().velocity_y());
-    return ui::ER_CONSUMED;
+    event->SetHandled();
   }
-
-  return ui::ER_UNHANDLED;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BaseScrollBar, ScrollDelegate implementation:
 
 void BaseScrollBar::OnScroll(float dx, float dy) {
   if (IsHorizontal())
     ScrollByContentsOffset(dx);
   else
     ScrollByContentsOffset(dy);
@@ skipping 218 matching lines @@
     thumb_position = thumb_position - (thumb_->GetSize() / 2);
   return (thumb_position * contents_size_) / GetTrackSize();
 }
 
 void BaseScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
   thumb_track_state_ = state;
   SchedulePaint();
 }
 
 }  // namespace views