chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc - Issue 1430023002: Enable AutoResize for Constrained Web Dialogs for Mac.

Unified Diff: chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

Issue 1430023002: Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/constrained_window/constrained_window_web_dialog_sheet.mm ('K') | « chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 08fec2d4b92fdfa973cb25196af406f634300584..88f6c7fb3c555f171c894f1c1e6de14848dd6b2f 100644

--- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

@@ -25,7 +25,6 @@ using web_modal::WebContentsModalDialogManager;

namespace {

-#if !defined(OS_MACOSX)

static const char kTestDataURL[] = "data:text/html,<!doctype html>"

"<body></body>"

"<style>"

@@ -41,7 +40,6 @@ std::string GetChangeDimensionsScript(int dimension) {

return base::StringPrintf("window.document.body.style.width = %d + 'px';"

"window.document.body.style.height = %d + 'px';", dimension, dimension);

}

-#endif

class ConstrainedWebDialogBrowserTestObserver

: public content::WebContentsObserver {

@@ -135,7 +133,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,

EXPECT_TRUE(observer.contents_destroyed());

}

-#if !defined(OS_MACOSX)

// Tests that dialog autoresizes based on web contents when autoresizing

// is enabled.

IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,

@@ -174,7 +171,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,

EXPECT_EQ(max_size, dialog_delegate->GetMaximumSize());

// Check for initial sizing. Dialog was created as a 400x400 dialog.

- EXPECT_EQ(gfx::Size(), web_contents->GetPreferredSize());

erikchen 2015/11/11 21:22:30 Why did you remove this expectation? At the very l

apacible 2015/11/12 02:02:24 Oops, returned.

apacible 2015/11/12 18:21:49 I remember why I'd removed it initially. In views,

ASSERT_EQ(initial_dialog_size, dialog_delegate->GetPreferredSize());

observer.Wait();

@@ -238,7 +234,6 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,

delegate->GetDialogSize(&initial_dialog_size);

// Check for initial sizing. Dialog was created as a 400x400 dialog.

- EXPECT_EQ(gfx::Size(), web_contents->GetPreferredSize());

ASSERT_EQ(initial_dialog_size, dialog_delegate->GetPreferredSize());

// Resize <body> to dimension smaller than dialog.

@@ -257,4 +252,3 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,

initial_dialog_size,

dialog_delegate)));

}

-#endif // !OS_MACOSX