| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index caac66a71de7efb962fd46a6bdbe94664d9c6f58..ea3549768be4e0142a0928aabe9e949dec20dc84 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -31,7 +31,6 @@
|
| #include "ash/common/wm/container_finder.h"
|
| #include "ash/common/wm/dock/docked_window_layout_manager.h"
|
| #include "ash/common/wm/fullscreen_window_finder.h"
|
| -#include "ash/common/wm/lock_layout_manager.h"
|
| #include "ash/common/wm/panels/panel_layout_manager.h"
|
| #include "ash/common/wm/root_window_layout_manager.h"
|
| #include "ash/common/wm/switchable_windows.h"
|
| @@ -617,12 +616,6 @@ void RootWindowController::InitLayoutManagers() {
|
|
|
| aura::Window* root_window = GetRootWindow();
|
|
|
| - WmWindow* lock_container = WmWindowAura::Get(
|
| - root_window->GetChildById(kShellWindowId_LockScreenContainer));
|
| - DCHECK(lock_container);
|
| - lock_container->SetLayoutManager(
|
| - base::MakeUnique<LockLayoutManager>(lock_container));
|
| -
|
| WmWindow* always_on_top_container =
|
| WmWindowAura::Get(GetContainer(kShellWindowId_AlwaysOnTopContainer));
|
| always_on_top_controller_.reset(
|
|
|