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

chrome/browser/ui/views/tabs/tab_strip.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 "chrome/browser/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 289 matching lines @@
  protected:
   // Overridden from views::View:
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* path) const OVERRIDE;
 #if defined(OS_WIN) && !defined(USE_AURA)
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
 #endif
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from ui::EventHandler:
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
  private:
   bool ShouldUseNativeFrame() const;
   gfx::ImageSkia GetBackgroundImage(views::CustomButton::ButtonState state,
                                     ui::ScaleFactor scale_factor) const;
   gfx::ImageSkia GetImageForState(views::CustomButton::ButtonState state,
                                   ui::ScaleFactor scale_factor) const;
   gfx::ImageSkia GetImage(ui::ScaleFactor scale_factor) const;
 
   // Tab strip that contains this button.
@@ skipping 52 matching lines @@
   }
   views::ImageButton::OnMouseReleased(event);
 }
 #endif
 
 void NewTabButton::OnPaint(gfx::Canvas* canvas) {
   gfx::ImageSkia image = GetImage(canvas->scale_factor());
   canvas->DrawImageInt(image, 0, height() - image.height());
 }
 
-ui::EventResult NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
+void NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
   // Consume all gesture events here so that the parent (Tab) does not
   // start consuming gestures.
   views::ImageButton::OnGestureEvent(event);
-  return ui::ER_CONSUMED;
+  event->SetHandled();
 }
 
 bool NewTabButton::ShouldUseNativeFrame() const {
   return GetWidget() &&
     GetWidget()->GetTopLevelWidget()->ShouldUseNativeFrame();
 }
 
 gfx::ImageSkia NewTabButton::GetBackgroundImage(
     views::CustomButton::ButtonState state,
     ui::ScaleFactor scale_factor) const {
@@ skipping 1058 matching lines @@
 }
 
 void TabStrip::OnMouseMoved(const ui::MouseEvent& event) {
   UpdateLayoutTypeFromMouseEvent(this, event);
 }
 
 void TabStrip::OnMouseEntered(const ui::MouseEvent& event) {
   SetResetToShrinkOnExit(true);
 }
 
-ui::EventResult TabStrip::OnGestureEvent(ui::GestureEvent* event) {
+void TabStrip::OnGestureEvent(ui::GestureEvent* event) {
   SetResetToShrinkOnExit(false);
   switch (event->type()) {
     case ui::ET_GESTURE_END:
       EndDrag(END_DRAG_COMPLETE);
       if (adjust_layout_) {
         SetLayoutType(TAB_STRIP_LAYOUT_STACKED, true);
         controller_->LayoutTypeMaybeChanged();
       }
       break;
 
     case ui::ET_GESTURE_LONG_PRESS:
       if (drag_controller_.get())
         drag_controller_->SetMoveBehavior(TabDragController::REORDER);
       break;
 
     case ui::ET_GESTURE_SCROLL_UPDATE:
       ContinueDrag(this, event->location());
       break;
 
     case ui::ET_GESTURE_BEGIN:
       EndDrag(END_DRAG_CANCEL);
       break;
 
     default:
       break;
   }
-  return ui::ER_CONSUMED;
+  event->SetHandled();
 }
 
 void TabStrip::GetCurrentTabWidths(double* unselected_width,
                                    double* selected_width) const {
   *unselected_width = current_unselected_width_;
   *selected_width = current_selected_width_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStrip, private:
@@ skipping 1067 matching lines @@
   if (!adjust_layout_)
     return false;
 
 #if !defined(OS_CHROMEOS)
   if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
     return false;
 #endif
 
   return true;
 }