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

Unified Diff: ash/shell.cc

Issue 10533032: cleanup: Remove applist v1 code. (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 | « ash/ash_switches.cc ('k') | ash/wm/app_list_controller.h » ('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 6857519f59db86bf6bafea80d694df4b4a1da95d..5229d268b9a245ad932989210fca19df4f212304 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -172,24 +172,13 @@ void CreateSpecialContainers(aura::RootWindow* root_window) {
"PanelContainer",
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);
- }
+ CreateContainer(internal::kShellWindowId_AppListContainer,
+ "AppListContainer",
+ non_lock_screen_containers);
aura::Window* modal_container = CreateContainer(
internal::kShellWindowId_SystemModalContainer,
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/wm/app_list_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698