Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1778)

Unified Diff: chrome/browser/ui/views/web_dialog_view_browsertest.cc

Issue 486063002: MacViews: Fix WebDialogBrowserTest.SizeWindow to get browser_tests compiling on MacViews (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bug link. nit comments Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/web_dialog_view_browsertest.cc
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
index dafe6baa39104f8f0cf9f1f0d6e8844e12719449..9069d81f2edf4dc8398418ea09208ab31245e50c 100644
--- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -84,12 +84,15 @@ class WebDialogBrowserTest : public InProcessBrowserTest {
WebDialogBrowserTest() {}
};
-// http://code.google.com/p/chromium/issues/detail?id=52602
-// Windows has some issues resizing windows- an off by one problem,
-// and a minimum size that seems too big. This file isn't included in
-// Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS
-// doesn't allow resizing of windows.
-IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
+// Windows has some issues resizing windows. An off by one problem, and a
+// minimum size that seems too big. See http://crbug.com/52602. On Chrome OS,
+// this test doesn't apply since ChromeOS doesn't allow resizing of windows.
+#if defined(OS_WIN) || defined(OS_CHROMEOS)
tapted 2014/08/19 13:17:57 There are some bot runs in crrev.com/487143002. As
msw 2014/08/19 18:56:36 Go ahead and enable on CrOS, that comment is surel
tapted 2014/08/20 11:32:23 Done.
+#define MAYBE_SizeWindow DISABLED_SizeWindow
+#else
+#define MAYBE_SizeWindow SizeWindow
+#endif
+IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
ui::test::TestWebDialogDelegate* delegate =
new ui::test::TestWebDialogDelegate(
GURL(chrome::kChromeUIChromeURLsURL));
@@ -100,8 +103,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents != NULL);
- views::Widget::CreateWindowWithParent(
- view, web_contents->GetTopLevelNativeWindow());
+ views::Widget::CreateWindowWithParent(view, web_contents->GetNativeView());
view->GetWidget()->Show();
// TestWebDialogView should quit current message loop on size change.
@@ -160,7 +162,12 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
- // Check to make sure we can't get to 0x0
+ // Check to make sure we can't get to 0x0. First make it larger than the
+ // minimum size to ensure there's something to change.
msw 2014/08/19 18:56:36 Is this verifying that re-sizing to 0x0 enforces t
tapted 2014/08/20 11:32:23 Yes - the old code was doing that below, but it wa
+ set_bounds.set_height(250);
+ view->MoveContents(web_contents, set_bounds);
+ content::RunMessageLoop(); // TestWebDialogView will quit.
+
set_bounds.set_width(0);
set_bounds.set_height(0);
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698