| Index: trunk/src/ash/desktop_background/desktop_background_controller.cc
|
| ===================================================================
|
| --- trunk/src/ash/desktop_background/desktop_background_controller.cc (revision 233812)
|
| +++ trunk/src/ash/desktop_background/desktop_background_controller.cc (working copy)
|
| @@ -362,7 +362,7 @@
|
| }
|
|
|
| void DesktopBackgroundController::InstallDesktopController(
|
| - aura::Window* root_window) {
|
| + aura::RootWindow* root_window) {
|
| internal::DesktopBackgroundWidgetController* component = NULL;
|
| int container_id = GetBackgroundContainerId(locked_);
|
|
|
| @@ -385,8 +385,8 @@
|
| }
|
|
|
| void DesktopBackgroundController::InstallDesktopControllerForAllWindows() {
|
| - aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| - for (aura::Window::Windows::iterator iter = root_windows.begin();
|
| + Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| + for (Shell::RootWindowList::iterator iter = root_windows.begin();
|
| iter != root_windows.end(); ++iter) {
|
| InstallDesktopController(*iter);
|
| }
|
|
|