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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: remove ash:: Created 3 years, 9 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/window_sizer/window_sizer_ash_uitest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 9e0ebf65510bc01eaa71a3d239dd0b884c192a97..af9894e66b9217f67321d432b28b389b50374389 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -102,7 +102,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerTest,
// Close the browser window so that clicking icon will create a new window.
CloseBrowser(browser_list->get(0));
EXPECT_EQ(0u, browser_list->size());
- EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
OpenBrowserUsingShelfOnRootWindow(root_windows[1]);
@@ -110,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerTest,
EXPECT_EQ(1u, browser_list->size());
EXPECT_EQ(root_windows[1],
browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[1], ash::Shell::GetRootWindowForNewWindows());
// Close the browser window so that clicking icon will create a new window.
CloseBrowser(browser_list->get(0));
@@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerTest,
EXPECT_EQ(1u, browser_list->size());
EXPECT_EQ(root_windows[0],
browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
}
namespace {
@@ -185,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest,
BrowserList* browser_list = BrowserList::GetInstance();
ASSERT_EQ(1u, browser_list->size());
- EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
CloseBrowser(browser_list->get(0));
OpenBrowserUsingContextMenuOnRootWindow(root_windows[1]);
@@ -194,7 +194,7 @@ IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest,
ASSERT_EQ(1u, browser_list->size());
EXPECT_EQ(root_windows[1],
browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[1], ash::Shell::GetRootWindowForNewWindows());
CloseBrowser(browser_list->get(0));
OpenBrowserUsingContextMenuOnRootWindow(root_windows[0]);
@@ -203,5 +203,5 @@ IN_PROC_BROWSER_TEST_F(WindowSizerContextMenuTest,
ASSERT_EQ(1u, browser_list->size());
EXPECT_EQ(root_windows[0],
browser_list->get(0)->window()->GetNativeWindow()->GetRootWindow());
- EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[0], ash::Shell::GetRootWindowForNewWindows());
}
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698