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

The EventHandler overriddes should mark the event as having been processed
(Event::SetHandled) when the event triggered an action, or stop the propagation
of the event (Event::StopPropagation) as appropriate (when the handler destroyed
the event-target, for example).

BUG=163618

Review URL: https://codereview.chromium.org/11280290

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

7 files changed, 16 insertions, 16 deletions

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index b4c4f9b..be5e381 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -304,7 +304,7 @@ void LauncherButton::OnBlur() {
   CustomButton::OnBlur();
 }
 
-ui::EventResult LauncherButton::OnGestureEvent(ui::GestureEvent* event) {
+void LauncherButton::OnGestureEvent(ui::GestureEvent* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       AddState(STATE_HOVERED);
@@ -314,14 +314,17 @@ ui::EventResult LauncherButton::OnGestureEvent(ui::GestureEvent* event) {
       return CustomButton::OnGestureEvent(event);
     case ui::ET_GESTURE_SCROLL_BEGIN:
       host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, *event);
-      return ui::ER_CONSUMED;
+      event->SetHandled();
+      return;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, *event);
-      return ui::ER_CONSUMED;
+      event->SetHandled();
+      return;
     case ui::ET_GESTURE_SCROLL_END:
     case ui::ET_SCROLL_FLING_START:
       host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
-      return ui::ER_CONSUMED;
+      event->SetHandled();
+      return;
     default:
       return CustomButton::OnGestureEvent(event);
   }
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
index f4c0755..c46b209 100644
--- a/ash/launcher/launcher_button.h
+++ b/ash/launcher/launcher_button.h
@@ -91,7 +91,7 @@ class LauncherButton : public views::CustomButton {
   virtual void OnBlur() OVERRIDE;
 
   // ui::EventHandler overrides:
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Sets the icon image with a shadow.
   void SetShadowedImage(const gfx::ImageSkia& bitmap);
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index 4263bd6..05e8ccc 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -302,15 +302,12 @@ ui::EventResult LauncherTooltipManager::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult LauncherTooltipManager::OnGestureEvent(
-    ui::GestureEvent* event) {
+void LauncherTooltipManager::OnGestureEvent(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::ER_UNHANDLED;
 }
 
 void LauncherTooltipManager::OnSessionStateEvent(
diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h
index 5bbab27..ee3395f 100644
--- a/ash/launcher/launcher_tooltip_manager.h
+++ b/ash/launcher/launcher_tooltip_manager.h
@@ -75,7 +75,7 @@ protected:
   // ui::EventHandler overrides:
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // SessionStateObserver override:
   virtual void OnSessionStateEvent(SessionStateObserver::EventType event)
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index 94b4c28..39ba6dc 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -184,8 +184,8 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) {
       base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000),
       ui::GestureEventDetails(ui::ET_GESTURE_BEGIN, 0.0f, 0.0f), 0);
   SetEventTarget(tooltip_widget->GetNativeWindow(), &gesture_event);
-  EXPECT_EQ(ui::ER_UNHANDLED,
-            event_handler->OnGestureEvent(&gesture_event));
+  event_handler->OnGestureEvent(&gesture_event);
+  EXPECT_FALSE(gesture_event.handled());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index f51da7a..4148c87 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -788,9 +788,9 @@ views::FocusTraversable* LauncherView::GetPaneFocusTraversable() {
   return this;
 }
 
-ui::EventResult LauncherView::OnGestureEvent(ui::GestureEvent* event) {
-  return gesture_handler_.ProcessGestureEvent(*event) ?
-      ui::ER_CONSUMED : ui::ER_UNHANDLED;
+void LauncherView::OnGestureEvent(ui::GestureEvent* event) {
+  if (gesture_handler_.ProcessGestureEvent(*event))
+    event->StopPropagation();
 }
 
 void LauncherView::LauncherItemAdded(int model_index) {
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index ece7ba6..ff5fd6a 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -184,7 +184,7 @@ class ASH_EXPORT LauncherView : public views::View,
   virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
 
   // Overridden from ui::EventHandler:
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from LauncherModelObserver:
   virtual void LauncherItemAdded(int model_index) OVERRIDE;