| Index: ash/wm/panels/panel_frame_view.h
|
| diff --git a/ash/wm/panels/panel_frame_view.h b/ash/wm/panels/panel_frame_view.h
|
| index 3c8938cf7bc9826523e1437973c85e4068d314b8..d4fe66ca60ae06d4eff748056a26c369d2b01146 100644
|
| --- a/ash/wm/panels/panel_frame_view.h
|
| +++ b/ash/wm/panels/panel_frame_view.h
|
| @@ -32,7 +32,7 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView {
|
| virtual ~PanelFrameView();
|
|
|
| // Overridden from views::View:
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| + virtual const char* GetClassName() const override;
|
|
|
| private:
|
| void InitHeaderPainter();
|
| @@ -41,21 +41,21 @@ class ASH_EXPORT PanelFrameView : public views::NonClientFrameView {
|
| int NonClientTopBorderHeight() const;
|
|
|
| // Overridden from views::NonClientFrameView:
|
| - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
|
| + virtual gfx::Rect GetBoundsForClientView() const override;
|
| virtual gfx::Rect GetWindowBoundsForClientBounds(
|
| - const gfx::Rect& client_bounds) const OVERRIDE;
|
| - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
|
| + const gfx::Rect& client_bounds) const override;
|
| + virtual int NonClientHitTest(const gfx::Point& point) override;
|
| virtual void GetWindowMask(const gfx::Size& size,
|
| - gfx::Path* window_mask) OVERRIDE;
|
| - virtual void ResetWindowControls() OVERRIDE;
|
| - virtual void UpdateWindowIcon() OVERRIDE;
|
| - virtual void UpdateWindowTitle() OVERRIDE;
|
| - virtual void SizeConstraintsChanged() OVERRIDE;
|
| + gfx::Path* window_mask) override;
|
| + virtual void ResetWindowControls() override;
|
| + virtual void UpdateWindowIcon() override;
|
| + virtual void UpdateWindowTitle() override;
|
| + virtual void SizeConstraintsChanged() override;
|
|
|
| // Overridden from views::View:
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE;
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| + virtual gfx::Size GetMinimumSize() const override;
|
| + virtual void Layout() override;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override;
|
|
|
| // Child View class describing the panel's title bar behavior
|
| // and buttons, owned by the view hierarchy
|
|
|