events: Update scroll and touch handlers to not return EventResult.

ash/launcher/overflow_bubble.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 "ash/launcher/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
@@ skipping 56 matching lines @@
   void ScrollByXOffset(int x_offset);
   void ScrollByYOffset(int y_offset);
 
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
   virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
 
   // ui::EventHandler overrides:
-  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   // views::BubbleDelegate overrides:
   virtual gfx::Rect GetBubbleBounds() OVERRIDE;
 
   ShelfLayoutManager* GetShelfLayoutManagerForLauncher() const {
     return ShelfLayoutManager::ForLauncher(
         anchor_view()->GetWidget()->GetNativeView());
   }
 
   LauncherView* launcher_view_;  // Owned by views hierarchy.
@@ skipping 90 matching lines @@
 bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (IsHorizontalAlignment())
     ScrollByXOffset(-event.offset());
   else
     ScrollByYOffset(-event.offset());
   Layout();
 
   return true;
 }
 
-ui::EventResult OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
+void OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
   ScrollByXOffset(-event->x_offset());
   ScrollByYOffset(-event->y_offset());
   Layout();
-  return ui::ER_HANDLED;
+  event->SetHandled();
 }
 
 gfx::Rect OverflowBubbleView::GetBubbleBounds() {
   views::BubbleBorder* border = GetBubbleFrameView()->bubble_border();
   gfx::Insets bubble_insets = border->GetInsets();
 
   const int border_size =
       views::BubbleBorder::is_arrow_on_horizontal(arrow_location()) ?
       bubble_insets.left() : bubble_insets.top();
   const int arrow_offset = border_size + kPadding + kLauncherViewLeadingInset +
@@ skipping 72 matching lines @@
   bubble_ = NULL;
 }
 
 void OverflowBubble::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash