diff options
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index b86ade2..4c3282b 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -61,6 +61,7 @@ #include "ash/wm/window_cycle_controller.h" #include "ash/wm/window_modality_controller.h" #include "ash/wm/window_util.h" +#include "ash/wm/workspace/always_on_top_layout_manager.h" #include "ash/wm/workspace_controller.h" #include "ash/wm/workspace/workspace_event_filter.h" #include "ash/wm/workspace/workspace_layout_manager.h" @@ -173,6 +174,10 @@ void CreateSpecialContainers(aura::RootWindow* root_window) { "LauncherContainer", non_lock_screen_containers); + CreateContainer(internal::kShellWindowId_AppListContainer, + "AppListContainer", + non_lock_screen_containers); + aura::Window* modal_container = CreateContainer( internal::kShellWindowId_SystemModalContainer, "SystemModalContainer", @@ -888,6 +893,12 @@ void Shell::InitLayoutManagers() { shelf_layout_manager->set_workspace_manager( workspace_controller_->workspace_manager()); + aura::Window* always_on_top_container = + GetContainer(internal::kShellWindowId_AlwaysOnTopContainer); + always_on_top_container->SetLayoutManager( + new internal::AlwaysOnTopLayoutManager( + always_on_top_container->GetRootWindow())); + // Create desktop background widget. // TODO(bshe): We should be able to use OnDesktopBackgroundChanged function // here after issue 117244 got fixed. |