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

Unified Diff: trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc

Issue 59153004: Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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: trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc
===================================================================
--- trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc (revision 233812)
+++ trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc (working copy)
@@ -336,7 +336,7 @@
// Keep the displays wide so that launchers have enough
// space for launcher buttons.
UpdateDisplay("400x400,600x400");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> normal_window(
CreateNormalWindow(gfx::Rect(450, 0, 100, 100)));
@@ -603,7 +603,7 @@
// Keep the displays wide so that launchers have enough
// space for launcher buttons.
UpdateDisplay("600x400,600x400");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> p1_d1(CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
scoped_ptr<aura::Window> p2_d1(CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
@@ -683,7 +683,7 @@
// buttons. Use differently sized displays so the launcher is in a different
// position on second display.
UpdateDisplay("600x400,600x600");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> p1_d1(CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
scoped_ptr<aura::Window> p1_d2(CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
@@ -702,7 +702,7 @@
return;
UpdateDisplay("600x400,600x400");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> p1_d2(CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
EXPECT_EQ(root_windows[1], p1_d2->GetRootWindow());
« no previous file with comments | « trunk/src/ash/wm/overview/window_selector_unittest.cc ('k') | trunk/src/ash/wm/panels/panel_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698