| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 8380945b567c68edec0f120db417a7bb8faa11a4..ccfa5c4372321ba69bdea30265846bfd083a99d7 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -171,14 +171,25 @@ void CreateSpecialContainers(aura::RootWindow* root_window) {
|
| "PanelContainer",
|
| non_lock_screen_containers);
|
|
|
| - CreateContainer(internal::kShellWindowId_AppListContainer,
|
| - "AppListContainer",
|
| - non_lock_screen_containers);
|
| + // V1 Applist container is below launcher container.
|
| + bool use_v2_applist = internal::AppListController::UseAppListV2();
|
| + if (!use_v2_applist) {
|
| + CreateContainer(internal::kShellWindowId_AppListContainer,
|
| + "AppListContainer",
|
| + non_lock_screen_containers);
|
| + }
|
|
|
| CreateContainer(internal::kShellWindowId_LauncherContainer,
|
| "LauncherContainer",
|
| non_lock_screen_containers);
|
|
|
| + // V2 Applist container is above launcher container.
|
| + if (use_v2_applist) {
|
| + CreateContainer(internal::kShellWindowId_AppListContainer,
|
| + "AppListContainer",
|
| + non_lock_screen_containers);
|
| + }
|
| +
|
| aura::Window* modal_container = CreateContainer(
|
| internal::kShellWindowId_SystemModalContainer,
|
| "SystemModalContainer",
|
|
|