| Index: ash/wm/base_layout_manager.cc
|
| diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc
|
| index 90c0d97d0a97eb081139d7628dbd8ab1a53c9610..65fb820215b77b91246a5d710f43efdec7c6284f 100644
|
| --- a/ash/wm/base_layout_manager.cc
|
| +++ b/ash/wm/base_layout_manager.cc
|
| @@ -15,7 +15,6 @@
|
| #include "ash/wm/workspace/workspace_window_resizer.h"
|
| #include "ui/aura/client/activation_client.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| -#include "ui/aura/root_window.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/compositor/layer.h"
|
| @@ -29,7 +28,7 @@ namespace internal {
|
| /////////////////////////////////////////////////////////////////////////////
|
| // BaseLayoutManager, public:
|
|
|
| -BaseLayoutManager::BaseLayoutManager(aura::RootWindow* root_window)
|
| +BaseLayoutManager::BaseLayoutManager(aura::Window* root_window)
|
| : root_window_(root_window) {
|
| Shell::GetInstance()->activation_client()->AddObserver(this);
|
| Shell::GetInstance()->AddShellObserver(this);
|
|
|