chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc - Issue 1674063002: Revert of [Reland] Enable AutoResize for Constrained Web Dialogs for Mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1674063002: Revert of [Reland] Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months 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

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 f7d39e55e2d6a0b0403b1c7d411ba89b279ef2a4..fbdf04f841ae2d25076515a62629fcb37516068a 100644

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

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

@@ -26,6 +26,7 @@

namespace {

+#if !defined(OS_MACOSX)

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

"<body></body>"

"<style>"

@@ -41,6 +42,7 @@

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 {

@@ -145,6 +147,7 @@

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,

@@ -170,12 +173,6 @@

gfx::Size min_size = gfx::Size(100, 100);

gfx::Size max_size = gfx::Size(200, 200);

gfx::Size initial_dialog_size;

-// OSX windows are initially created with non-empty dimensions. The

-// autoresizeable dialog's window dimensions are determined after initial

-// creation.

-#if defined(OS_MACOSX)

- initial_dialog_size = gfx::Size(1, 1);

-#endif

delegate->GetDialogSize(&initial_dialog_size);

ConstrainedWebDialogDelegate* dialog_delegate =

@@ -189,6 +186,7 @@

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());

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

observer.Wait();

@@ -252,6 +250,7 @@

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.

@@ -270,3 +269,4 @@

initial_dialog_size,

dialog_delegate)));

}

+#endif // !OS_MACOSX

« no previous file with comments | « chrome/browser/ui/webui/constrained_web_dialog_ui.h ('k') | no next file » | no next file with comments »