| Index: ui/views/window/custom_frame_view.h
|
| diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
|
| index a09dd33723891d44e9d97320a13a2ba334fe3aaa..b8fc5c4d86de7a5155965edce87c31a4ddb4a585 100644
|
| --- a/ui/views/window/custom_frame_view.h
|
| +++ b/ui/views/window/custom_frame_view.h
|
| @@ -34,31 +34,30 @@ class VIEWS_EXPORT CustomFrameView : public NonClientFrameView,
|
| public ButtonListener {
|
| public:
|
| CustomFrameView();
|
| - virtual ~CustomFrameView();
|
| + ~CustomFrameView() override;
|
|
|
| void Init(Widget* frame);
|
|
|
| // Overridden from NonClientFrameView:
|
| - virtual gfx::Rect GetBoundsForClientView() const override;
|
| - virtual gfx::Rect GetWindowBoundsForClientBounds(
|
| + gfx::Rect GetBoundsForClientView() const override;
|
| + gfx::Rect GetWindowBoundsForClientBounds(
|
| 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;
|
| + int NonClientHitTest(const gfx::Point& point) override;
|
| + void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
|
| + void ResetWindowControls() override;
|
| + void UpdateWindowIcon() override;
|
| + void UpdateWindowTitle() override;
|
| + void SizeConstraintsChanged() override;
|
|
|
| // Overridden from View:
|
| - virtual void OnPaint(gfx::Canvas* canvas) override;
|
| - virtual void Layout() override;
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual gfx::Size GetMaximumSize() const override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + gfx::Size GetMaximumSize() const override;
|
|
|
| // Overridden from ButtonListener:
|
| - virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
|
| + void ButtonPressed(Button* sender, const ui::Event& event) override;
|
|
|
| private:
|
| friend class CustomFrameViewTest;
|
|
|