chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc - Issue 1440173003: Revert of 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 1440173003: Revert of 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

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

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

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

@@ -25,6 +25,7 @@

namespace {

+#if !defined(OS_MACOSX)

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

"<body></body>"

"<style>"

@@ -40,6 +41,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 {

@@ -133,6 +135,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,

@@ -171,6 +174,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();

@@ -234,6 +238,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.

@@ -252,3 +257,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 »