| Index: ash/launcher/overflow_bubble.cc
|
| ===================================================================
|
| --- ash/launcher/overflow_bubble.cc (revision 151481)
|
| +++ ash/launcher/overflow_bubble.cc (working copy)
|
| @@ -75,8 +75,8 @@
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
|
| - virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
|
| - virtual bool OnScrollEvent(const views::ScrollEvent & event) OVERRIDE;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + virtual bool OnScrollEvent(const ui::ScrollEvent& event) OVERRIDE;
|
|
|
| // views::BubbleDelegate overrides:
|
| virtual gfx::Rect GetBubbleBounds() OVERRIDE;
|
| @@ -178,7 +178,7 @@
|
| SizeToContents();
|
| }
|
|
|
| -bool OverflowBubbleView::OnMouseWheel(const views::MouseWheelEvent& event) {
|
| +bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
|
| if (is_horizontal_alignment())
|
| ScrollByXOffset(-event.offset());
|
| else
|
| @@ -188,7 +188,7 @@
|
| return true;
|
| }
|
|
|
| -bool OverflowBubbleView::OnScrollEvent(const views::ScrollEvent & event) {
|
| +bool OverflowBubbleView::OnScrollEvent(const ui::ScrollEvent& event) {
|
| ScrollByXOffset(-event.x_offset());
|
| ScrollByYOffset(-event.y_offset());
|
| Layout();
|
|
|