Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Unified Diff: ash/shell.cc

Issue 10544009: ash/app_list: Make applist bubble edge touch launcher bar edge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/app_list/app_list_bubble_border.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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",
« no previous file with comments | « no previous file | ui/app_list/app_list_bubble_border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698