| Index: ui/views/window/dialog_client_view.h
|
| diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
|
| index bf38f25fdba6968862741722fac9866db915dc1b..a04dd4690d662b117948c3b1d9bbb983db45727b 100644
|
| --- a/ui/views/window/dialog_client_view.h
|
| +++ b/ui/views/window/dialog_client_view.h
|
| @@ -32,7 +32,7 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
|
| public FocusChangeListener {
|
| public:
|
| DialogClientView(Widget* widget, View* contents_view);
|
| - virtual ~DialogClientView();
|
| + ~DialogClientView() override;
|
|
|
| // Accept or Cancel the dialog.
|
| void AcceptWindow();
|
| @@ -46,27 +46,25 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
|
| void UpdateDialogButtons();
|
|
|
| // ClientView implementation:
|
| - virtual bool CanClose() override;
|
| - virtual DialogClientView* AsDialogClientView() override;
|
| - virtual const DialogClientView* AsDialogClientView() const override;
|
| + bool CanClose() override;
|
| + DialogClientView* AsDialogClientView() override;
|
| + const DialogClientView* AsDialogClientView() const override;
|
|
|
| // FocusChangeListener implementation:
|
| - virtual void OnWillChangeFocus(View* focused_before,
|
| - View* focused_now) override;
|
| - virtual void OnDidChangeFocus(View* focused_before,
|
| - View* focused_now) override;
|
| + void OnWillChangeFocus(View* focused_before, View* focused_now) override;
|
| + void OnDidChangeFocus(View* focused_before, View* focused_now) override;
|
|
|
| // View implementation:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
|
| - virtual void ViewHierarchyChanged(
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
| - virtual void NativeViewHierarchyChanged() override;
|
| - virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
|
| + void NativeViewHierarchyChanged() override;
|
| + void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
|
|
|
| // ButtonListener implementation:
|
| - virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
|
| + void ButtonPressed(Button* sender, const ui::Event& event) override;
|
|
|
| protected:
|
| // For testing.
|
| @@ -82,8 +80,8 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
|
| void CreateFootnoteView();
|
|
|
| // View implementation.
|
| - virtual void ChildPreferredSizeChanged(View* child) override;
|
| - virtual void ChildVisibilityChanged(View* child) override;
|
| + void ChildPreferredSizeChanged(View* child) override;
|
| + void ChildVisibilityChanged(View* child) override;
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(DialogClientViewTest, FocusManager);
|
|
|