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

chrome/browser/ui/views/tabs/tab.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.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 339 matching lines @@
       tab_->controller()->OnMouseEventInTab(this, event);
     CustomButton::OnMouseMoved(event);
   }
 
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE {
     if (tab_->controller())
       tab_->controller()->OnMouseEventInTab(this, event);
     CustomButton::OnMouseReleased(event);
   }
 
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     // Consume all gesture events here so that the parent (Tab) does not
     // start consuming gestures.
     ImageButton::OnGestureEvent(event);
-    return ui::ER_CONSUMED;
+    event->SetHandled();
   }
 
  private:
   Tab* tab_;
 
   DISALLOW_COPY_AND_ASSIGN(TabCloseButton);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageCacheEntry
@@ skipping 554 matching lines @@
 void Tab::OnMouseMoved(const ui::MouseEvent& event) {
   hover_controller_.SetLocation(event.location());
   if (controller())
     controller()->OnMouseEventInTab(this, event);
 }
 
 void Tab::OnMouseExited(const ui::MouseEvent& event) {
   hover_controller_.Hide();
 }
 
-ui::EventResult Tab::OnGestureEvent(ui::GestureEvent* event) {
-  if (!controller())
-    return ui::ER_CONSUMED;
+void Tab::OnGestureEvent(ui::GestureEvent* event) {
+  if (!controller()) {
+    event->SetHandled();
+    return;
+  }
 
   switch (event->type()) {
     case ui::ET_GESTURE_BEGIN: {
       if (event->details().touch_points() != 1)
-        return ui::ER_UNHANDLED;
+        return;
 
       TabStripSelectionModel original_selection;
       original_selection.Copy(controller()->GetSelectionModel());
       if (!IsSelected())
         controller()->SelectTab(this);
       gfx::Point loc(event->location());
       views::View::ConvertPointToScreen(this, &loc);
       controller()->MaybeStartDrag(this, *event, original_selection);
       break;
     }
 
     case ui::ET_GESTURE_END:
       controller()->EndDrag(END_DRAG_COMPLETE);
       break;
 
     case ui::ET_GESTURE_SCROLL_UPDATE:
       controller()->ContinueDrag(this, event->location());
       break;
 
     default:
       break;
   }
-  return ui::ER_CONSUMED;
+  event->SetHandled();
 }
 
 void Tab::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PAGETAB;
   state->name = data_.title;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tab, private
 
@@ skipping 585 matching lines @@
                          const gfx::ImageSkia& image) {
   DCHECK_NE(scale_factor, ui::SCALE_FACTOR_NONE);
   ImageCacheEntry entry;
   entry.resource_id = resource_id;
   entry.scale_factor = scale_factor;
   entry.image = image;
   image_cache_->push_front(entry);
   if (image_cache_->size() > kMaxImageCacheSize)
     image_cache_->pop_back();
 }