| Index: ash/shelf/overflow_bubble_view.h
|
| diff --git a/ash/shelf/overflow_bubble_view.h b/ash/shelf/overflow_bubble_view.h
|
| index 4348a2d4c860c8665a95c25167beaea9b905d348..9d928ebc740b3f40fbedd9360db961f1e59cf508 100644
|
| --- a/ash/shelf/overflow_bubble_view.h
|
| +++ b/ash/shelf/overflow_bubble_view.h
|
| @@ -28,7 +28,7 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView {
|
| void InitOverflowBubble(views::View* anchor, ShelfView* shelf_view);
|
|
|
| // views::BubbleDelegateView overrides:
|
| - virtual gfx::Rect GetBubbleBounds() OVERRIDE;
|
| + virtual gfx::Rect GetBubbleBounds() override;
|
|
|
| private:
|
| friend class test::OverflowBubbleViewTestAPI;
|
| @@ -44,13 +44,13 @@ class ASH_EXPORT OverflowBubbleView : public views::BubbleDelegateView {
|
| void ScrollByYOffset(int y_offset);
|
|
|
| // views::View overrides:
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE;
|
| - virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
|
| - virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual void Layout() override;
|
| + virtual void ChildPreferredSizeChanged(views::View* child) override;
|
| + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
|
|
|
| // ui::EventHandler overrides:
|
| - virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| + virtual void OnScrollEvent(ui::ScrollEvent* event) override;
|
|
|
| ShelfLayoutManager* GetShelfLayoutManager() const;
|
|
|
|
|