| Index: ash/common/wm/root_window_layout_manager.cc
|
| diff --git a/ash/common/wm/root_window_layout_manager.cc b/ash/common/wm/root_window_layout_manager.cc
|
| index dda538477afdb1e8cad1d10dedeb8c41626c11a4..15ec3fbfaaa0219b4aa5d078c9da5d5a12fa3be3 100644
|
| --- a/ash/common/wm/root_window_layout_manager.cc
|
| +++ b/ash/common/wm/root_window_layout_manager.cc
|
| @@ -5,7 +5,8 @@
|
| #include "ash/common/wm/root_window_layout_manager.h"
|
|
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_tracker.h"
|
| +#include "ui/aura/window.h"
|
| +#include "ui/aura/window_tracker.h"
|
|
|
| namespace ash {
|
| namespace wm {
|
| @@ -26,16 +27,16 @@ void RootWindowLayoutManager::OnWindowResized() {
|
|
|
| // Resize both our immediate children (the containers-of-containers animated
|
| // by PowerButtonController) and their children (the actual containers).
|
| - WmWindowTracker children_tracker(owner_->GetChildren());
|
| + aura::WindowTracker children_tracker(owner_->aura_window()->children());
|
| while (!children_tracker.windows().empty()) {
|
| - WmWindow* child = children_tracker.Pop();
|
| + aura::Window* child = children_tracker.Pop();
|
| // Skip descendants of top-level windows, i.e. only resize containers and
|
| // other windows without a delegate, such as ScreenDimmer windows.
|
| if (child->GetToplevelWindow())
|
| continue;
|
|
|
| child->SetBounds(fullscreen_bounds);
|
| - WmWindowTracker grandchildren_tracker(child->GetChildren());
|
| + aura::WindowTracker grandchildren_tracker(child->children());
|
| while (!grandchildren_tracker.windows().empty()) {
|
| child = grandchildren_tracker.Pop();
|
| if (!child->GetToplevelWindow())
|
|
|