events: Get rid of GestureStatus in favour of EventResult.

chrome/browser/ui/views/tabs/base_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/base_tab.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
@@ skipping 72 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::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE {
     // Consume all gesture events here so that the parent (BaseTab) does not
     // start consuming gestures.
     ImageButton::OnGestureEvent(event);
-    return ui::GESTURE_STATUS_CONSUMED;
+    return ui::ER_CONSUMED;
   }
 
  private:
   BaseTab* tab_;
 
   DISALLOW_COPY_AND_ASSIGN(TabCloseButton);
 };
 
 namespace {
 
@@ skipping 295 matching lines @@
 
 void BaseTab::OnMouseMoved(const ui::MouseEvent& event) {
   if (controller())
     controller()->OnMouseEventInTab(this, event);
 }
 
 void BaseTab::OnMouseExited(const ui::MouseEvent& event) {
   hover_controller_.Hide();
 }
 
-ui::GestureStatus BaseTab::OnGestureEvent(const ui::GestureEvent& event) {
+ui::EventResult BaseTab::OnGestureEvent(const ui::GestureEvent& event) {
   if (!controller())
-    return ui::GESTURE_STATUS_CONSUMED;
+    return ui::ER_CONSUMED;
 
   switch (event.type()) {
     case ui::ET_GESTURE_BEGIN: {
       if (event.details().touch_points() != 1)
-        return ui::GESTURE_STATUS_UNKNOWN;
+        return ui::ER_UNHANDLED;
 
       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::GESTURE_STATUS_CONSUMED;
+  return ui::ER_CONSUMED;
 }
 
 bool BaseTab::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
   if (data_.title.empty())
     return false;
 
   // Only show the tooltip if the title is truncated.
   if (font_->GetStringWidth(data_.title) > GetTitleBounds().width()) {
     *tooltip = data_.title;
     return true;
@@ skipping 200 matching lines @@
 // static
 void BaseTab::InitResources() {
   static bool initialized = false;
   if (!initialized) {
     initialized = true;
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     font_ = new gfx::Font(rb.GetFont(ui::ResourceBundle::BaseFont));
     font_height_ = font_->GetHeight();
   }
 }