views: Start converting View into an EventTarget.

The EventDispatcher interface is not acually used for dispatching events yet.
That will happen once RootView is turned into an EventDispatcher. But this first
step prepares scroll, touch, and gesture event dispatching in views so that it
is compatible with the EventDispatcher interface.

BUG=none

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

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

5 files changed, 41 insertions, 38 deletions

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index aed69eb..eacd850 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -259,30 +259,6 @@ void LauncherButton::OnMouseExited(const ui::MouseEvent& event) {
   host_->MouseExitedButton(this);
 }
 
-ui::EventResult LauncherButton::OnGestureEvent(
-    const ui::GestureEvent& event) {
-  switch (event.type()) {
-    case ui::ET_GESTURE_TAP_DOWN:
-      AddState(STATE_HOVERED);
-      return CustomButton::OnGestureEvent(event);
-    case ui::ET_GESTURE_END:
-      ClearState(STATE_HOVERED);
-      return CustomButton::OnGestureEvent(event);
-    case ui::ET_GESTURE_SCROLL_BEGIN:
-      host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event);
-      return ui::ER_CONSUMED;
-    case ui::ET_GESTURE_SCROLL_UPDATE:
-      host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, event);
-      return ui::ER_CONSUMED;
-    case ui::ET_GESTURE_SCROLL_END:
-    case ui::ET_SCROLL_FLING_START:
-      host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
-      return ui::ER_CONSUMED;
-    default:
-      return CustomButton::OnGestureEvent(event);
-  }
-}
-
 void LauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = host_->GetAccessibleName(this);
@@ -328,6 +304,29 @@ void LauncherButton::OnBlur() {
   CustomButton::OnBlur();
 }
 
+ui::EventResult LauncherButton::OnGestureEvent(ui::GestureEvent* event) {
+  switch (event->type()) {
+    case ui::ET_GESTURE_TAP_DOWN:
+      AddState(STATE_HOVERED);
+      return CustomButton::OnGestureEvent(event);
+    case ui::ET_GESTURE_END:
+      ClearState(STATE_HOVERED);
+      return CustomButton::OnGestureEvent(event);
+    case ui::ET_GESTURE_SCROLL_BEGIN:
+      host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, *event);
+      return ui::ER_CONSUMED;
+    case ui::ET_GESTURE_SCROLL_UPDATE:
+      host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, *event);
+      return ui::ER_CONSUMED;
+    case ui::ET_GESTURE_SCROLL_END:
+    case ui::ET_SCROLL_FLING_START:
+      host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
+      return ui::ER_CONSUMED;
+    default:
+      return CustomButton::OnGestureEvent(event);
+  }
+}
+
 void LauncherButton::Init() {
   icon_view_ = CreateIconView();
 
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h
index 930bdc2..f4c0755 100644
--- a/ash/launcher/launcher_button.h
+++ b/ash/launcher/launcher_button.h
@@ -84,14 +84,15 @@ 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::EventResult OnGestureEvent(const ui::GestureEvent& event)
-      OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
+  // ui::EventHandler overrides:
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+
   // Sets the icon image with a shadow.
   void SetShadowedImage(const gfx::ImageSkia& bitmap);
   // Override for custom initialization.
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 1006993..47c23c5 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -775,11 +775,6 @@ gfx::Size LauncherView::GetPreferredSize() {
                    last_button_bounds.bottom() + leading_inset());
 }
 
-ui::EventResult LauncherView::OnGestureEvent(const ui::GestureEvent& event) {
-  return gesture_handler_.ProcessGestureEvent(event) ?
-      ui::ER_CONSUMED : ui::ER_UNHANDLED;
-}
-
 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   LayoutToIdealBounds();
   FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
@@ -793,6 +788,11 @@ 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::LauncherItemAdded(int model_index) {
   model_index = CancelDrag(model_index);
   views::View* view = CreateViewForItem(model_->items()[model_index]);
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 63528e8..ece7ba6 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -180,11 +180,12 @@ class ASH_EXPORT LauncherView : public views::View,
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual ui::EventResult OnGestureEvent(
-      const ui::GestureEvent& event) OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
   virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
 
+  // Overridden from ui::EventHandler:
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+
   // Overridden from LauncherModelObserver:
   virtual void LauncherItemAdded(int model_index) OVERRIDE;
   virtual void LauncherItemRemoved(int model_index, LauncherID id) OVERRIDE;
diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc
index e05d087..e5f78cd 100644
--- a/ash/launcher/overflow_bubble.cc
+++ b/ash/launcher/overflow_bubble.cc
@@ -78,7 +78,9 @@ class OverflowBubbleView : public views::BubbleDelegateView {
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
   virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
-  virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
+
+  // ui::EventHandler overrides:
+  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   // views::BubbleDelegate overrides:
   virtual gfx::Rect GetBubbleBounds() OVERRIDE;
@@ -190,11 +192,11 @@ bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   return true;
 }
 
-bool OverflowBubbleView::OnScrollEvent(const ui::ScrollEvent& event) {
-  ScrollByXOffset(-event.x_offset());
-  ScrollByYOffset(-event.y_offset());
+ui::EventResult OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
+  ScrollByXOffset(-event->x_offset());
+  ScrollByYOffset(-event->y_offset());
   Layout();
-  return true;
+  return ui::ER_HANDLED;
 }
 
 gfx::Rect OverflowBubbleView::GetBubbleBounds() {