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

Unified Diff: ash/wm/overview/window_selector_unittest.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: ash/wm/overview/window_selector_unittest.cc
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index ba179610daa9d238d2647f7a1b1f68e160822f07..40d65fe64699440db9ad9361642a9068f98d8bb2 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -691,7 +691,7 @@ TEST_F(WindowSelectorTest, MultipleDisplays) {
return;
UpdateDisplay("600x400,600x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
gfx::Rect bounds1(0, 0, 400, 400);
gfx::Rect bounds2(650, 0, 400, 400);
@@ -753,7 +753,7 @@ TEST_F(WindowSelectorTest, CycleOverviewUsesInitialDisplay) {
return;
UpdateDisplay("400x400,400x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));
@@ -779,7 +779,7 @@ TEST_F(WindowSelectorTest, CycleMultipleDisplaysCopiesWindows) {
return;
UpdateDisplay("400x400,400x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
gfx::Rect root1_rect(0, 0, 100, 100);
gfx::Rect root2_rect(450, 0, 100, 100);
@@ -848,7 +848,7 @@ TEST_F(WindowSelectorTest, MultipleDisplaysOverviewTransitionToCycle) {
return;
UpdateDisplay("400x400,400x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));
@@ -877,7 +877,7 @@ TEST_F(WindowSelectorTest, BoundsChangeDuringCycleOnOtherDisplay) {
return;
UpdateDisplay("400x400,400x400");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window1(CreateWindow(gfx::Rect(0, 0, 100, 100)));
scoped_ptr<aura::Window> window2(CreateWindow(gfx::Rect(450, 0, 100, 100)));

Powered by Google App Engine
This is Rietveld 408576698