| Index: chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
|
| index d24da343196d36d7db8b7f84b3c244a14b088f91..1b2d51538d73a1ed982d42f67646c250be59b988 100644
|
| --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
|
| @@ -70,8 +70,27 @@ class AutoResizingTestWebDialogDelegate
|
|
|
| // Dialog delegates for auto-resizing dialogs are expected not to set |size|.
|
| void GetDialogSize(gfx::Size* size) const override {}
|
| +
|
| + ui::ModalType GetDialogModalType() const override {
|
| + return ui::MODAL_TYPE_CHILD;
|
| + }
|
| };
|
|
|
| +class ChildModalTestWebDialogDelegate
|
| + : public ui::test::TestWebDialogDelegate {
|
| + public:
|
| + explicit ChildModalTestWebDialogDelegate(const GURL& url)
|
| + : TestWebDialogDelegate(url) {}
|
| + ~ChildModalTestWebDialogDelegate() override {}
|
| +
|
| + // Dialog is child modal
|
| + ui::ModalType GetDialogModalType() const override {
|
| + return ui::MODAL_TYPE_CHILD;
|
| + }
|
| +
|
| +};
|
| +
|
| +
|
| } // namespace
|
|
|
| class ConstrainedWebDialogBrowserTest : public InProcessBrowserTest {
|
| @@ -107,7 +126,7 @@ class ConstrainedWebDialogBrowserTest : public InProcessBrowserTest {
|
| // Tests that opening/closing the constrained window won't crash it.
|
| IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) {
|
| // The delegate deletes itself.
|
| - WebDialogDelegate* delegate = new ui::test::TestWebDialogDelegate(
|
| + WebDialogDelegate* delegate = new ChildModalTestWebDialogDelegate(
|
| GURL(chrome::kChromeUIConstrainedHTMLTestURL));
|
| WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| @@ -124,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) {
|
| IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,
|
| ReleaseWebContentsOnDialogClose) {
|
| // The delegate deletes itself.
|
| - WebDialogDelegate* delegate = new ui::test::TestWebDialogDelegate(
|
| + WebDialogDelegate* delegate = new ChildModalTestWebDialogDelegate(
|
| GURL(chrome::kChromeUIConstrainedHTMLTestURL));
|
| WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| @@ -237,7 +256,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,
|
| ContentResizeInNonAutoResizingDialog) {
|
| // The delegate deletes itself.
|
| WebDialogDelegate* delegate =
|
| - new ui::test::TestWebDialogDelegate(GURL(kTestDataURL));
|
| + new ChildModalTestWebDialogDelegate(GURL(kTestDataURL));
|
| WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(web_contents);
|
|
|