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

Unified Diff: trunk/src/ash/wm/workspace/workspace_window_resizer_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
« no previous file with comments | « trunk/src/ash/wm/workspace/workspace_window_resizer.cc ('k') | trunk/src/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: trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc
===================================================================
--- trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc (revision 233812)
+++ trunk/src/ash/wm/workspace/workspace_window_resizer_unittest.cc (working copy)
@@ -602,7 +602,7 @@
return;
UpdateDisplay("800x600,500x600");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
// Window is wide enough not to get docked right away.
window_->SetBoundsInScreen(gfx::Rect(800, 10, 400, 60),
@@ -646,7 +646,7 @@
return;
UpdateDisplay("800x600,800x600");
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
ASSERT_EQ(2U, root_windows.size());
window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
@@ -1876,7 +1876,7 @@
UpdateDisplay("500x400,500x400");
window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
Shell::GetScreen()->GetPrimaryDisplay());
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
scoped_ptr<WindowResizer> resizer(CreateResizerForTest(
« no previous file with comments | « trunk/src/ash/wm/workspace/workspace_window_resizer.cc ('k') | trunk/src/chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698