events: Get rid of GestureStatus in favour of EventResult.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/10912063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154721 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 12 insertions, 12 deletions

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index dfbeb4c..d9a2583 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -258,7 +258,7 @@ void LauncherButton::OnMouseExited(const ui::MouseEvent& event) {
   host_->MouseExitedButton(this);
 }
 
-ui::GestureStatus LauncherButton::OnGestureEvent(
+ui::EventResult LauncherButton::OnGestureEvent(
     const ui::GestureEvent& event) {
   switch (event.type()) {
     case ui::ET_GESTURE_TAP_DOWN:
@@ -269,13 +269,13 @@ ui::GestureStatus LauncherButton::OnGestureEvent(
       return CustomButton::OnGestureEvent(event);
     case ui::ET_GESTURE_SCROLL_BEGIN:
       host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event);
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, event);
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     case ui::ET_GESTURE_SCROLL_END:
       host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     default:
       return CustomButton::OnGestureEvent(event);
   }
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
index eb4a735..2b65f24 100644
--- a/ash/launcher/launcher_button.h
+++ b/ash/launcher/launcher_button.h
@@ -84,7 +84,7 @@ class LauncherButton : public views::CustomButton {
   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
-  virtual ui::GestureStatus OnGestureEvent(const ui::GestureEvent& event)
+  virtual ui::EventResult OnGestureEvent(const ui::GestureEvent& event)
       OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void Layout() OVERRIDE;
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index cb82ee8..0ebe961 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -342,7 +342,7 @@ ui::TouchStatus LauncherTooltipManager::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus LauncherTooltipManager::PreHandleGestureEvent(
+ui::EventResult LauncherTooltipManager::PreHandleGestureEvent(
     aura::Window* target, ui::GestureEvent* event) {
   if (widget_ && widget_->IsVisible()) {
     // Because this mouse event may arrive to |view_|, here we just schedule
@@ -350,7 +350,7 @@ ui::GestureStatus LauncherTooltipManager::PreHandleGestureEvent(
     CloseSoon();
   }
 
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void LauncherTooltipManager::WillDeleteShelf() {
diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
index 7443049..ed8943e 100644
--- a/ash/launcher/launcher_tooltip_manager.h
+++ b/ash/launcher/launcher_tooltip_manager.h
@@ -78,7 +78,7 @@ protected:
   virtual ui::TouchStatus PreHandleTouchEvent(
       aura::Window* target,
       ui::TouchEvent* event) OVERRIDE;
-  virtual ui::GestureStatus PreHandleGestureEvent(
+  virtual ui::EventResult PreHandleGestureEvent(
       aura::Window* target,
       ui::GestureEvent* event) OVERRIDE;
 
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index 29c17ba..3de9ce8 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -165,7 +165,7 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) {
       ui::ET_GESTURE_BEGIN, 0, 0, ui::EF_NONE,
       base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000),
       ui::GestureEventDetails(ui::ET_GESTURE_BEGIN, 0.0f, 0.0f), 0);
-  EXPECT_EQ(ui::GESTURE_STATUS_UNKNOWN,
+  EXPECT_EQ(ui::ER_UNHANDLED,
             event_filter->PreHandleGestureEvent(root_window, &gesture_event));
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 4c87029..7141bf9 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -748,9 +748,9 @@ gfx::Size LauncherView::GetPreferredSize() {
                    last_button_bounds.bottom() + leading_inset());
 }
 
-ui::GestureStatus LauncherView::OnGestureEvent(const ui::GestureEvent& event) {
+ui::EventResult LauncherView::OnGestureEvent(const ui::GestureEvent& event) {
   return gesture_handler_.ProcessGestureEvent(event) ?
-      ui::GESTURE_STATUS_CONSUMED : ui::GESTURE_STATUS_UNKNOWN;
+      ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 2749949..2b3378c 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -174,7 +174,7 @@ class ASH_EXPORT LauncherView : public views::View,
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;