| Index: ui/views/bubble/tray_bubble_view.h
|
| diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h
|
| index 54f6cc880338051975c5a0d131f4025fe9fd00bc..8ffd58dafa2db514eb0a801b01897e3af7488cfc 100644
|
| --- a/ui/views/bubble/tray_bubble_view.h
|
| +++ b/ui/views/bubble/tray_bubble_view.h
|
| @@ -147,25 +147,25 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView,
|
| bool is_gesture_dragging() const { return is_gesture_dragging_; }
|
|
|
| // Overridden from views::WidgetDelegate.
|
| - virtual bool CanActivate() const OVERRIDE;
|
| + virtual bool CanActivate() const override;
|
| virtual views::NonClientFrameView* CreateNonClientFrameView(
|
| - views::Widget* widget) OVERRIDE;
|
| - virtual bool WidgetHasHitTestMask() const OVERRIDE;
|
| - virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;
|
| + views::Widget* widget) override;
|
| + virtual bool WidgetHasHitTestMask() const override;
|
| + virtual void GetWidgetHitTestMask(gfx::Path* mask) const override;
|
|
|
| // Overridden from views::BubbleDelegateView.
|
| - virtual gfx::Rect GetAnchorRect() const OVERRIDE;
|
| + virtual gfx::Rect GetAnchorRect() const override;
|
|
|
| // Overridden from views::View.
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual gfx::Size GetMaximumSize() const OVERRIDE;
|
| - virtual int GetHeightForWidth(int width) const OVERRIDE;
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual gfx::Size GetMaximumSize() const override;
|
| + virtual int GetHeightForWidth(int width) const override;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| + virtual void GetAccessibleState(ui::AXViewState* state) override;
|
|
|
| // Overridden from MouseWatcherListener
|
| - virtual void MouseMovedOutOfHost() OVERRIDE;
|
| + virtual void MouseMovedOutOfHost() override;
|
|
|
| protected:
|
| TrayBubbleView(gfx::NativeView parent_window,
|
| @@ -174,12 +174,12 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView,
|
| const InitParams& init_params);
|
|
|
| // Overridden from views::BubbleDelegateView.
|
| - virtual void Init() OVERRIDE;
|
| + virtual void Init() override;
|
|
|
| // Overridden from views::View.
|
| - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
|
| + virtual void ChildPreferredSizeChanged(View* child) override;
|
| virtual void ViewHierarchyChanged(
|
| - const ViewHierarchyChangedDetails& details) OVERRIDE;
|
| + const ViewHierarchyChangedDetails& details) override;
|
|
|
| private:
|
| InitParams params_;
|
|
|