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

ui/views/controls/scroll_view.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/scroll_view.h"
 
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
@@ skipping 415 matching lines @@
   // Give vertical scrollbar priority
   if (vert_sb_->visible())
     processed = vert_sb_->OnKeyPressed(event);
 
   if (!processed && horiz_sb_->visible())
     processed = horiz_sb_->OnKeyPressed(event);
 
   return processed;
 }
 
-ui::EventResult ScrollView::OnGestureEvent(ui::GestureEvent* event) {
-  ui::EventResult status = ui::ER_UNHANDLED;
-
+void ScrollView::OnGestureEvent(ui::GestureEvent* event) {
   // If the event happened on one of the scrollbars, then those events are
   // sent directly to the scrollbars. Otherwise, only scroll events are sent to
   // the scrollbars.
   bool scroll_event = event->type() == ui::ET_GESTURE_SCROLL_UPDATE ||
                       event->type() == ui::ET_GESTURE_SCROLL_BEGIN ||
                       event->type() == ui::ET_GESTURE_SCROLL_END ||
                       event->type() == ui::ET_SCROLL_FLING_START;
 
   if (vert_sb_->visible()) {
     if (vert_sb_->bounds().Contains(event->location()) || scroll_event)
-      status = vert_sb_->OnGestureEvent(event);
+      vert_sb_->OnGestureEvent(event);
   }
-  if (status == ui::ER_UNHANDLED && horiz_sb_->visible()) {
+  if (!event->handled() && horiz_sb_->visible()) {
     if (horiz_sb_->bounds().Contains(event->location()) || scroll_event)
-      status = horiz_sb_->OnGestureEvent(event);
+      horiz_sb_->OnGestureEvent(event);
   }
-  return status;
 }
 
 bool ScrollView::OnMouseWheel(const ui::MouseWheelEvent& e) {
   bool processed = false;
   // Give vertical scrollbar priority
   if (vert_sb_->visible())
     processed = vert_sb_->OnMouseWheel(e);
 
   if (!processed && horiz_sb_->visible())
     processed = horiz_sb_->OnMouseWheel(e);
@@ skipping 80 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views