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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_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: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index e07bae08db04b43549ba633a02555be2cdbc5985..22a1477e6953849166602f721dab90be2f531e1d 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -1658,9 +1658,9 @@ void ChromeLauncherController::SetShelfAutoHideBehaviorPrefs(
}
void ChromeLauncherController::SetShelfAutoHideBehaviorFromPrefs() {
- ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
- for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
+ for (aura::Window::Windows::const_iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
GetShelfAutoHideBehavior(*iter), *iter);
@@ -1671,9 +1671,9 @@ void ChromeLauncherController::SetShelfAlignmentFromPrefs() {
if (!ash::ShelfWidget::ShelfAlignmentAllowed())
return;
- ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
+ aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
- for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
+ for (aura::Window::Windows::const_iterator iter = root_windows.begin();
iter != root_windows.end(); ++iter) {
// See comment in |kShelfAlignment| as to why we consider two prefs.
const std::string alignment_value(

Powered by Google App Engine
This is Rietveld 408576698