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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/workspace/workspace_window_resizer_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
« ash/display/output_configurator_animation.h ('K') | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 1e75349d39375045997241b6b39f1a4b109b1e96..2066f2d451a418b4ac0da851979f0a51b99d0200 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -581,7 +581,7 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
return;
UpdateDisplay("800x600,200x600");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
window_->SetBoundsInScreen(gfx::Rect(800, 10, 50, 60),
ScreenAsh::GetSecondaryDisplay());
@@ -626,7 +626,7 @@ TEST_F(WorkspaceWindowResizerTest, CancelSnapPhantom) {
return;
UpdateDisplay("800x600,800x600");
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
ASSERT_EQ(2U, root_windows.size());
window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
@@ -1874,7 +1874,7 @@ TEST_F(WorkspaceWindowResizerTest, PhantomWindowShow) {
UpdateDisplay("500x400,500x400");
window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
Shell::GetScreen()->GetPrimaryDisplay());
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
« ash/display/output_configurator_animation.h ('K') | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698