| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 7c59ecc542182d97d3f04f9cdfdc6b22aa7113ce..4013b80039b21dfd7eaa16058542afd0f2291caf 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -222,7 +222,7 @@ gfx::Screen* Shell::GetScreen() {
|
| }
|
|
|
| // static
|
| -Shell::RootWindowList Shell::GetAllRootWindows() {
|
| +aura::Window::Windows Shell::GetAllRootWindows() {
|
| return Shell::GetInstance()->display_controller()->
|
| GetAllRootWindows();
|
| }
|
| @@ -244,8 +244,8 @@ std::vector<aura::Window*> Shell::GetContainersFromAllRootWindows(
|
| int container_id,
|
| aura::Window* priority_root) {
|
| std::vector<aura::Window*> containers;
|
| - RootWindowList root_windows = GetAllRootWindows();
|
| - for (RootWindowList::const_iterator it = root_windows.begin();
|
| + aura::Window::Windows root_windows = GetAllRootWindows();
|
| + for (aura::Window::Windows::const_iterator it = root_windows.begin();
|
| it != root_windows.end(); ++it) {
|
| aura::Window* container = (*it)->GetChildById(container_id);
|
| if (container) {
|
|
|