diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 20:00:55 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 20:00:55 +0000 |
| commit | 1af71f763b647c746d744f1d1ab38d3f6f930f7d (patch) | |
| tree | db27984258010e6f5e8bb00a9d9b6d34f73c0e72 /ash/root_window_controller.cc | |
| parent | 39d290c311d31c1c0e12ccda0c5a22b4571693fa (diff) | |
| download | chromium_src-1af71f763b647c746d744f1d1ab38d3f6f930f7d.zip chromium_src-1af71f763b647c746d744f1d1ab38d3f6f930f7d.tar.gz chromium_src-1af71f763b647c746d744f1d1ab38d3f6f930f7d.tar.bz2 | |
Use WorkspaceLayoutManager for AlwaysOnTop and Lock containers
BUG=338906
TEST=Tested on the device and confirmed that login/lock screens are fine.
Review URL: https://codereview.chromium.org/148173014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index b52204c8..d295cae 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -43,6 +43,7 @@ #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" +#include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/wm/workspace_controller.h" #include "base/command_line.h" #include "base/time/time.h" @@ -707,8 +708,8 @@ void RootWindowController::InitLayoutManagers() { aura::Window* always_on_top_container = GetContainer(kShellWindowId_AlwaysOnTopContainer); always_on_top_container->SetLayoutManager( - new BaseLayoutManager( - always_on_top_container->GetRootWindow())); + new internal::WorkspaceLayoutManager( + always_on_top_container)); always_on_top_controller_.reset(new internal::AlwaysOnTopController); always_on_top_controller_->SetAlwaysOnTopContainer(always_on_top_container); @@ -902,7 +903,7 @@ void RootWindowController::CreateContainersInRootWindow( "LockScreenContainer", lock_screen_containers); lock_container->SetLayoutManager( - new BaseLayoutManager(root_window)); + new internal::WorkspaceLayoutManager(lock_container)); SetUsesScreenCoordinates(lock_container); // TODO(beng): stopsevents |