| Index: ash/wm/overview/window_selector.cc
|
| diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
|
| index 16345f6a2370474fcc1543791eca2cc93ba7fb7d..a7818f5130df8c6ef374ab913e5a91894fb04ec8 100644
|
| --- a/ash/wm/overview/window_selector.cc
|
| +++ b/ash/wm/overview/window_selector.cc
|
| @@ -281,8 +281,8 @@ WindowSelector::WindowSelector(const WindowList& windows,
|
| // Observe window activations and switchable containers on all root windows
|
| // for newly created windows during overview.
|
| Shell::GetInstance()->activation_client()->AddObserver(this);
|
| - Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| - for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
|
| + aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| + for (aura::Window::Windows::const_iterator iter = root_windows.begin();
|
| iter != root_windows.end(); ++iter) {
|
| for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
|
| Shell::GetContainer(*iter,
|
| @@ -306,8 +306,8 @@ WindowSelector::~WindowSelector() {
|
| (*iter)->RemoveObserver(this);
|
| }
|
| Shell::GetInstance()->activation_client()->RemoveObserver(this);
|
| - Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
|
| - for (Shell::RootWindowList::const_iterator iter = root_windows.begin();
|
| + aura::Window::Windows root_windows = Shell::GetAllRootWindows();
|
| + for (aura::Window::Windows::const_iterator iter = root_windows.begin();
|
| iter != root_windows.end(); ++iter) {
|
| for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
|
| Shell::GetContainer(*iter,
|
|
|