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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 64933002: Eliminate Shell::RootWindowList in favor of aura::Window::Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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/views/tabs/tab_drag_controller_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 1e1ea17b8dbc390a6c577e88dae6176c6f9c50c9..9568b368cff2b8ee6e6879da5cf553a1142d4c92 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -1392,9 +1392,9 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
// With the touch input the browser cannot be dragged from one screen
// to another and the window stays on the first screen.
if (input_source() == INPUT_SOURCE_MOUSE) {
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
- aura::RootWindow* second_root = roots[1];
+ aura::Window* second_root = roots[1];
EXPECT_EQ(second_root,
new_browser->window()->GetNativeWindow()->GetRootWindow());
}
@@ -1444,9 +1444,9 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
ResetIDs(browser2->tab_strip_model(), 100);
// Move the second browser to the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
- aura::RootWindow* second_root = roots[1];
+ aura::Window* second_root = roots[1];
gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
second_root).work_area();
browser2->window()->SetBounds(work_area);
@@ -1494,9 +1494,9 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
ResetIDs(browser2->tab_strip_model(), 100);
// Move both browsers to the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
- aura::RootWindow* second_root = roots[1];
+ aura::Window* second_root = roots[1];
gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
second_root).work_area();
browser()->window()->SetBounds(work_area);
@@ -1553,10 +1553,10 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
TabStrip* tab_strip = GetTabStripForBrowser(browser());
// Create another browser on the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
- aura::RootWindow* first_root = roots[0];
- aura::RootWindow* second_root = roots[1];
+ aura::Window* first_root = roots[0];
+ aura::Window* second_root = roots[1];
gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
second_root).work_area();
work_area.Inset(20,20,20,60);
@@ -1626,9 +1626,9 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
ResetIDs(browser2->tab_strip_model(), 100);
// Move the second browser to the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
- aura::RootWindow* second_root = roots[1];
+ aura::Window* second_root = roots[1];
gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
second_root).work_area();
browser2->window()->SetBounds(work_area);
@@ -1772,7 +1772,7 @@ IN_PROC_BROWSER_TEST_P(DifferentDeviceScaleFactorDisplayTabDragControllerTest,
TabStrip* tab_strip = GetTabStripForBrowser(browser());
// Move the second browser to the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
// Move to the first tab and drag it enough so that it detaches.
@@ -1838,7 +1838,7 @@ void CancelDragTabToWindowInSeparateDisplayStep3(
void CancelDragTabToWindowInSeparateDisplayStep2(
DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest* test,
TabStrip* tab_strip,
- aura::RootWindow* current_root,
+ aura::Window* current_root,
gfx::Point final_destination,
const BrowserList* browser_list) {
ASSERT_FALSE(tab_strip->IsDragSessionActive());
@@ -1868,7 +1868,7 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
// Move the second browser to the second display.
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
gfx::Point final_destination =
gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
@@ -1899,7 +1899,7 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest,
CancelDragTabToWindowIn1stDisplay) {
- std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
+ aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
ASSERT_EQ(2u, roots.size());
// Add another tab.

Powered by Google App Engine
This is Rietveld 408576698