| Index: ui/views/window/non_client_view.h
|
| diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
|
| index 99a68800aeb4c8ba9dff462e9e334638d3765e6c..762ccf1ba1a25ff22f31727152d8557e347ad958 100644
|
| --- a/ui/views/window/non_client_view.h
|
| +++ b/ui/views/window/non_client_view.h
|
| @@ -39,7 +39,7 @@ class VIEWS_EXPORT NonClientFrameView : public View,
|
| kClientEdgeThickness = 1,
|
| };
|
|
|
| - virtual ~NonClientFrameView();
|
| + ~NonClientFrameView() override;
|
|
|
| // Sets whether the window should be rendered as active regardless of the
|
| // actual active state. Used when bubbles become active to make their parent
|
| @@ -82,18 +82,18 @@ class VIEWS_EXPORT NonClientFrameView : public View,
|
| virtual void SizeConstraintsChanged() = 0;
|
|
|
| // View:
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| - virtual const char* GetClassName() const override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
| + const char* GetClassName() const override;
|
|
|
| protected:
|
| NonClientFrameView();
|
|
|
| // ViewTargeterDelegate:
|
| - virtual bool DoesIntersectRect(const View* target,
|
| - const gfx::Rect& rect) const override;
|
| + bool DoesIntersectRect(const View* target,
|
| + const gfx::Rect& rect) const override;
|
|
|
| // View:
|
| - virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
| + void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
|
|
| private:
|
| // Prevents the non-client frame view from being rendered as inactive when
|
| @@ -143,7 +143,7 @@ class VIEWS_EXPORT NonClientView : public View, public ViewTargeterDelegate {
|
| static const char kViewClassName[];
|
|
|
| NonClientView();
|
| - virtual ~NonClientView();
|
| + ~NonClientView() override;
|
|
|
| // Returns the current NonClientFrameView instance, or NULL if
|
| // it does not exist.
|
| @@ -215,24 +215,23 @@ class VIEWS_EXPORT NonClientView : public View, public ViewTargeterDelegate {
|
| void SetAccessibleName(const base::string16& name);
|
|
|
| // NonClientView, View overrides:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual gfx::Size GetMaximumSize() const override;
|
| - virtual void Layout() override;
|
| - virtual void GetAccessibleState(ui::AXViewState* state) override;
|
| - virtual const char* GetClassName() const override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + gfx::Size GetMaximumSize() const override;
|
| + void Layout() override;
|
| + void GetAccessibleState(ui::AXViewState* state) override;
|
| + const char* GetClassName() const override;
|
|
|
| - virtual views::View* GetTooltipHandlerForPoint(
|
| - const gfx::Point& point) override;
|
| + views::View* GetTooltipHandlerForPoint(const gfx::Point& point) override;
|
|
|
| protected:
|
| // NonClientView, View overrides:
|
| - virtual void ViewHierarchyChanged(
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
|
|
| private:
|
| // ViewTargeterDelegate:
|
| - virtual View* TargetForRect(View* root, const gfx::Rect& rect) override;
|
| + View* TargetForRect(View* root, const gfx::Rect& rect) override;
|
|
|
| // A ClientView object or subclass, responsible for sizing the contents view
|
| // of the window, hit testing and perhaps other tasks depending on the
|
|
|