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

Unified Diff: trunk/src/ash/wm/workspace/phantom_window_controller.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/workspace/phantom_window_controller.cc
===================================================================
--- trunk/src/ash/wm/workspace/phantom_window_controller.cc (revision 233812)
+++ trunk/src/ash/wm/workspace/phantom_window_controller.cc (working copy)
@@ -124,7 +124,7 @@
// in one root window and progress into another root.
aura::Window* start_root = wm::GetRootWindowMatching(start_bounds_);
if (start_root == target_root) {
- aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
for (size_t i = 0; i < root_windows.size(); ++i) {
if (root_windows[i] != target_root &&
root_windows[i]->GetBoundsInScreen().Intersects(start_bounds_)) {
« no previous file with comments | « trunk/src/ash/wm/window_cycle_controller_unittest.cc ('k') | trunk/src/ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698