| 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(
|
|
|