| Index: ash/launcher/overflow_bubble.cc
|
| diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc
|
| index d2f889e09ab89c5c71fca94417b472b55d17e3c3..06a0f52382828fd77aba37186e8e16da94fe6c77 100644
|
| --- a/ash/launcher/overflow_bubble.cc
|
| +++ b/ash/launcher/overflow_bubble.cc
|
| @@ -74,7 +74,7 @@ class OverflowBubbleView : public views::BubbleDelegateView {
|
| 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;
|
| @@ -185,11 +185,11 @@ bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
|
| 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() {
|
|
|