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

Unified Diff: ash/display/display_controller.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/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 8a0b6b97457a7b1f13614776ca83c1dcb9a120f7..4d739834c3129b264aec3d368fab4b7b487e379d 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -341,8 +341,8 @@ void DisplayController::CloseChildWindows() {
}
}
-std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
- std::vector<aura::RootWindow*> windows;
+aura::Window::Windows DisplayController::GetAllRootWindows() {
+ aura::Window::Windows windows;
for (std::map<int64, aura::RootWindow*>::const_iterator it =
root_windows_.begin(); it != root_windows_.end(); ++it) {
DCHECK(it->second);
@@ -790,7 +790,7 @@ void DisplayController::UpdateHostWindowNames() {
// to "aura_root_0" so gtalk can find the primary root window to broadcast.
// TODO(jhorwich) Remove this once Chrome supports window-based broadcasting.
aura::Window* primary = Shell::GetPrimaryRootWindow();
- Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
for (size_t i = 0; i < root_windows.size(); ++i) {
std::string name =
root_windows[i] == primary ? "aura_root_0" : "aura_root_x";

Powered by Google App Engine
This is Rietveld 408576698