| Index: ash/test/child_modal_window.h
|
| diff --git a/ash/test/child_modal_window.h b/ash/test/child_modal_window.h
|
| index 5521b4f7c3236e2eb65f12c57439bbb50f39fd09..f0c6f014adf85cf90009edebde049b40a6265fb2 100644
|
| --- a/ash/test/child_modal_window.h
|
| +++ b/ash/test/child_modal_window.h
|
| @@ -27,7 +27,7 @@ class ChildModalParent : public views::WidgetDelegateView,
|
| public views::WidgetObserver {
|
| public:
|
| ChildModalParent(gfx::NativeView context);
|
| - virtual ~ChildModalParent();
|
| + ~ChildModalParent() override;
|
|
|
| void ShowChild();
|
| gfx::NativeWindow GetModalParent() const;
|
| @@ -37,22 +37,21 @@ class ChildModalParent : public views::WidgetDelegateView,
|
| views::Widget* CreateChild();
|
|
|
| // Overridden from views::WidgetDelegate:
|
| - virtual View* GetContentsView() override;
|
| - virtual base::string16 GetWindowTitle() const override;
|
| - virtual bool CanResize() const override;
|
| - virtual void DeleteDelegate() override;
|
| + View* GetContentsView() override;
|
| + base::string16 GetWindowTitle() const override;
|
| + bool CanResize() const override;
|
| + void DeleteDelegate() override;
|
|
|
| // Overridden from views::View:
|
| - virtual void Layout() override;
|
| - virtual void ViewHierarchyChanged(
|
| + void Layout() override;
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
|
|
| // Overridden from ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // Overridden from WidgetObserver:
|
| - virtual void OnWidgetDestroying(views::Widget* widget) override;
|
| + void OnWidgetDestroying(views::Widget* widget) override;
|
|
|
| // The button to toggle showing and hiding the child window. The child window
|
| // does not block input to this button.
|
|
|