diff options
Diffstat (limited to 'ash/launcher/overflow_bubble.cc')
-rw-r--r-- | ash/launcher/overflow_bubble.cc | 12 |
1 files changed, 7 insertions, 5 deletions
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() { |