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

ui/views/controls/menu/submenu_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/menu/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 242 matching lines @@
         first_vis_index++;
     }
     ScrollRectToVisible(gfx::Rect(gfx::Point(0, scroll_target),
                                   vis_bounds.size()));
     vis_bounds = GetVisibleBounds();
   }
 
   return true;
 }
 
-ui::EventResult SubmenuView::OnGestureEvent(ui::GestureEvent* event) {
-  ui::EventResult to_return = ui::ER_CONSUMED;
+void SubmenuView::OnGestureEvent(ui::GestureEvent* event) {
+  bool handled = true;
   switch (event->type()) {
     case ui::ET_GESTURE_SCROLL_BEGIN:
       scroll_animator_->Stop();
       break;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       OnScroll(0, event->details().scroll_y());
       break;
     case ui::ET_GESTURE_SCROLL_END:
       break;
     case ui::ET_SCROLL_FLING_START:
       if (event->details().velocity_y() != 0.0f)
         scroll_animator_->Start(0, event->details().velocity_y());
       break;
     case ui::ET_GESTURE_TAP_DOWN:
     case ui::ET_SCROLL_FLING_CANCEL:
       scroll_animator_->Stop();
       break;
     default:
-      to_return = ui::ER_UNHANDLED;
+      handled = false;
       break;
   }
-  return to_return;
+  if (handled)
+    event->SetHandled();
 }
 
 bool SubmenuView::IsShowing() {
   return host_ && host_->IsMenuHostVisible();
 }
 
 void SubmenuView::ShowAt(Widget* parent,
                          const gfx::Rect& bounds,
                          bool do_capture) {
   if (host_) {
@@ skipping 151 matching lines @@
   int y = vis_bounds.y() - static_cast<int>(dy);
   // clamp y to [0, full_height - vis_height)
   y = std::max(y, 0);
   y = std::min(y, full_bounds.height() - vis_bounds.height() - 1);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds)
     ScrollRectToVisible(new_vis_bounds);
 }
 
 }  // namespace views