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
Denger-Network · Sep 4, 2012 · 5b174e0 · 5b174e0
1 parent df2ac9a
commit 5b174e0
Show file tree

Hide file tree

Showing 137 changed files with 327 additions and 338 deletions.
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
@@ -89,10 +89,10 @@ ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus AcceleratorFilter::PreHandleGestureEvent(
+ui::EventResult AcceleratorFilter::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 }  // namespace internal

diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
@@ -28,7 +28,7 @@ class ASH_EXPORT AcceleratorFilter : public aura::EventFilter {
   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/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
@@ -97,10 +97,10 @@ ui::TouchStatus MouseCursorEventFilter::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus MouseCursorEventFilter::PreHandleGestureEvent(
+ui::EventResult MouseCursorEventFilter::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(

diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h
@@ -54,7 +54,7 @@ class ASH_EXPORT MouseCursorEventFilter : public aura::EventFilter {
   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/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
@@ -261,10 +261,10 @@ ui::TouchStatus DragDropController::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_CONTINUE;
 }
 
-ui::GestureStatus DragDropController::PreHandleGestureEvent(
+ui::EventResult DragDropController::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void DragDropController::OnWindowDestroyed(aura::Window* window) {

diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h
@@ -69,7 +69,7 @@ class ASH_EXPORT DragDropController
   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_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
@@ -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
@@ -342,15 +342,15 @@ 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
     // the closing event rather than directly calling Close().
     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
@@ -78,7 +78,7 @@ class ASH_EXPORT LauncherTooltipManager : public aura::EventFilter,
   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
@@ -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
@@ -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
@@ -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;

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
@@ -105,7 +105,7 @@ class MagnificationControllerImpl : virtual public MagnificationController,
   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;
 
@@ -452,10 +452,10 @@ ui::TouchStatus MagnificationControllerImpl::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus MagnificationControllerImpl::PreHandleGestureEvent(
+ui::EventResult MagnificationControllerImpl::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
@@ -62,10 +62,10 @@ const views::Widget* StatusAreaWidgetDelegate::GetWidget() const {
   return View::GetWidget();
 }
 
-ui::GestureStatus StatusAreaWidgetDelegate::OnGestureEvent(
+ui::EventResult StatusAreaWidgetDelegate::OnGestureEvent(
     const ui::GestureEvent& event) {
   if (gesture_handler_.ProcessGestureEvent(event))
-    return ui::GESTURE_STATUS_CONSUMED;
+    return ui::ER_CONSUMED;
 
   return views::AccessiblePaneView::OnGestureEvent(event);
 }

diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
@@ -41,7 +41,7 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE;
 
   // views::WidgetDelegate overrides:

diff --git a/ash/system/tray/tray_bubble_view.cc b/ash/system/tray/tray_bubble_view.cc
@@ -476,10 +476,10 @@ ui::TouchStatus TrayBubbleView::Host::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus TrayBubbleView::Host::PreHandleGestureEvent(
+ui::EventResult TrayBubbleView::Host::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void TrayBubbleView::Host::ProcessLocatedEvent(

diff --git a/ash/system/tray/tray_bubble_view.h b/ash/system/tray/tray_bubble_view.h
@@ -55,7 +55,7 @@ class TrayBubbleView : public views::BubbleDelegateView {
     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/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc
@@ -120,12 +120,12 @@ bool TrayNotificationView::OnMousePressed(const ui::MouseEvent& event) {
   return true;
 }
 
-ui::GestureStatus TrayNotificationView::OnGestureEvent(
+ui::EventResult TrayNotificationView::OnGestureEvent(
     const ui::GestureEvent& event) {
   if (event.type() != ui::ET_GESTURE_TAP)
-    return ui::GESTURE_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   HandleClickAction();
-  return ui::GESTURE_STATUS_CONSUMED;
+  return ui::ER_CONSUMED;
 }
 
 void TrayNotificationView::OnClose() {

diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h
@@ -54,7 +54,7 @@ class TrayNotificationView : public views::View,
 
   // Overridden from views::View.
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE;
 
  protected:

diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
@@ -148,13 +148,13 @@ void ActionableView::OnPaintFocusBorder(gfx::Canvas* canvas) {
     DrawBorder(canvas, GetLocalBounds());
 }
 
-ui::GestureStatus ActionableView::OnGestureEvent(
+ui::EventResult ActionableView::OnGestureEvent(
     const ui::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP) {
-    return PerformAction(event) ? ui::GESTURE_STATUS_CONSUMED :
-                                  ui::GESTURE_STATUS_UNKNOWN;
+    return PerformAction(event) ? ui::ER_CONSUMED :
+                                  ui::ER_UNHANDLED;
   }
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void ActionableView::GetAccessibleState(ui::AccessibleViewState* state) {

diff --git a/ash/system/tray/tray_views.h b/ash/system/tray/tray_views.h
@@ -78,7 +78,7 @@ class ASH_EXPORT ActionableView : public views::View {
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;

diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
@@ -492,16 +492,16 @@ class WebNotificationView : public views::View,
     return true;
   }
 
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE {
     if (event.type() == ui::ET_GESTURE_TAP) {
       tray_->OnClicked(notification_.id);
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
       ShowMenu(event.location());
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (event.type() == ui::ET_SCROLL_FLING_START) {
@@ -515,11 +515,11 @@ class WebNotificationView : public views::View,
         RestoreVisualState();
         scroller_->OnGestureEvent(event);
       }
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (!event.IsScrollGestureEvent())
-      return ui::GESTURE_STATUS_UNKNOWN;
+      return ui::ER_UNHANDLED;
 
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
       gesture_scroll_amount_ = 0.f;
@@ -544,7 +544,7 @@ class WebNotificationView : public views::View,
 
     if (scroller_)
       scroller_->OnGestureEvent(event);
-    return ui::GESTURE_STATUS_CONSUMED;
+    return ui::ER_CONSUMED;
   }
 
   // Overridden from ButtonListener.

diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
@@ -305,10 +305,10 @@ ui::TouchStatus TooltipController::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus TooltipController::PreHandleGestureEvent(
+ui::EventResult TooltipController::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void TooltipController::OnWindowDestroyed(aura::Window* window) {

diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
@@ -49,7 +49,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
   virtual ui::TouchStatus PreHandleTouchEvent(
       aura::Window* target,
       ui::TouchEvent* event) OVERRIDE;
-  virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target,
+  virtual ui::EventResult PreHandleGestureEvent(aura::Window* target,
       ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from aura::WindowObserver.

diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
@@ -213,10 +213,10 @@ ui::TouchStatus TouchObserverHUD::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus TouchObserverHUD::PreHandleGestureEvent(
+ui::EventResult TouchObserverHUD::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) {

diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
@@ -42,7 +42,7 @@ class TouchObserverHUD : public aura::EventFilter,
   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/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
@@ -251,12 +251,12 @@ ui::TouchStatus AppListController::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus AppListController::PreHandleGestureEvent(
+ui::EventResult AppListController::PreHandleGestureEvent(
     aura::Window* target,
     ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP)
     ProcessLocatedEvent(target, *event);
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return ui::ER_UNHANDLED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/ash/wm/app_list_controller.h b/ash/wm/app_list_controller.h
@@ -81,7 +81,7 @@ class AppListController : public aura::EventFilter,
   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/wm/event_rewriter_event_filter.cc b/ash/wm/event_rewriter_event_filter.cc
@@ -63,9 +63,9 @@ ui::TouchStatus EventRewriterEventFilter::PreHandleTouchEvent(
   return ui::TOUCH_STATUS_UNKNOWN;  // Not handled.
 }
 
-ui::GestureStatus EventRewriterEventFilter::PreHandleGestureEvent(
+ui::EventResult EventRewriterEventFilter::PreHandleGestureEvent(
     aura::Window* target, ui::GestureEvent* event) {
-  return ui::GESTURE_STATUS_UNKNOWN;  // Not handled.
+  return ui::ER_UNHANDLED;  // Not handled.
 }
 
 }  // namespace internal