| Index: athena/main/athena_frame_view.h
|
| diff --git a/athena/main/athena_frame_view.h b/athena/main/athena_frame_view.h
|
| index 5140c2dfefa46ab82bb569bad29b9c67dbac3257..c9a90fa24f9d9a373f25e0daa3b6c4d2cbe59e81 100644
|
| --- a/athena/main/athena_frame_view.h
|
| +++ b/athena/main/athena_frame_view.h
|
| @@ -24,21 +24,21 @@ class AthenaFrameView : public views::NonClientFrameView {
|
| virtual ~AthenaFrameView();
|
|
|
| // views::NonClientFrameView overrides:
|
| - 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 {}
|
|
|
| // views::View overrides:
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE {}
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual const char* GetClassName() const override;
|
| + virtual void Layout() override {}
|
|
|
| private:
|
| gfx::Insets NonClientBorderInsets() const;
|
|
|