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

Unified Diff: ash/root_window_controller_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/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index b8c480c6ff0221297ce005ee40a59228d970c344..78c96d9f6a13f6add83d0b107ba662226b179993 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -145,7 +145,7 @@ class RootWindowControllerTest : public test::AshTestBase {
return widget;
}
- aura::Window* GetModalContainer(aura::RootWindow* root_window) {
+ aura::Window* GetModalContainer(aura::Window* root_window) {
return Shell::GetContainer(
root_window,
ash::internal::kShellWindowId_SystemModalContainer);
@@ -157,7 +157,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
return;
UpdateDisplay("600x600,500x500");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
internal::RootWindowController* controller =
Shell::GetPrimaryRootWindowController();
internal::ShelfLayoutManager* shelf_layout_manager =
@@ -290,7 +290,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_Modal) {
UpdateDisplay("500x500,500x500");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
// Emulate virtual screen coordinate system.
root_windows[0]->SetBounds(gfx::Rect(0, 0, 500, 500));
root_windows[1]->SetBounds(gfx::Rect(500, 0, 500, 500));
@@ -638,7 +638,7 @@ TEST_F(VirtualKeyboardRootWindowControllerTest,
UpdateDisplay("500x500,500x500");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
aura::Window* primary_root_window = Shell::GetPrimaryRootWindow();
aura::Window* secondary_root_window =
root_windows[0] == primary_root_window ?

Powered by Google App Engine
This is Rietveld 408576698