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

Unified Diff: trunk/src/ash/drag_drop/drag_drop_controller_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/drag_drop/drag_drop_controller_unittest.cc
===================================================================
--- trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (revision 233812)
+++ trunk/src/ash/drag_drop/drag_drop_controller_unittest.cc (working copy)
@@ -1020,9 +1020,9 @@
return;
UpdateDisplay("400x400,400x400");
- aura::Window::Windows root_windows =
+ Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
- for (aura::Window::Windows::iterator iter = root_windows.begin();
+ for (Shell::RootWindowList::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
aura::client::SetDragDropClient(*iter, drag_drop_controller_.get());
}
@@ -1099,7 +1099,7 @@
EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
}
- for (aura::Window::Windows::iterator iter = root_windows.begin();
+ for (Shell::RootWindowList::iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
aura::client::SetDragDropClient(*iter, NULL);
}
« no previous file with comments | « trunk/src/ash/display/screen_position_controller_unittest.cc ('k') | trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698