Reland 140878 - cleanup: Remove applist v1 code.

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 155 matching lines @@
       "AlwaysOnTopContainer",
       non_lock_screen_containers);
   always_on_top_container->SetEventFilter(
       new ToplevelWindowEventFilter(always_on_top_container));
   SetChildWindowVisibilityChangesAnimated(always_on_top_container);
 
   CreateContainer(internal::kShellWindowId_PanelContainer,
                   "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,
       "SystemModalContainer",
       non_lock_screen_containers);
   modal_container->SetEventFilter(
       new ToplevelWindowEventFilter(modal_container));
   modal_container->SetLayoutManager(
       new internal::SystemModalContainerLayoutManager(modal_container));
   SetChildWindowVisibilityChangesAnimated(modal_container);
@@ skipping 407 matching lines @@
   aura::client::SetTooltipClient(GetPrimaryRootWindow(), NULL);
 
   // Make sure we delete WorkspaceController before launcher is
   // deleted as it has a reference to launcher model.
   workspace_controller_.reset();
 
   // The system tray needs to be reset before all the windows are destroyed.
   system_tray_.reset();
   tray_delegate_.reset();
 
+  // AppList needs to be released before shelf layout manager, which is
+  // destroyed with launcher container in the loop below. However, app list
+  // container is now on top of launcher container and released after it.
+  // TODO(xiyuan): Move it back when app list container is no longer needed.
+  app_list_controller_.reset();
+
   // Destroy secondary monitor's widgets before all the windows are destroyed.
   monitor_controller_.reset();
 
   // Delete containers now so that child windows does not access
   // observers when they are destructed.
   aura::RootWindow* root_window = GetPrimaryRootWindow();
   while (!root_window->children().empty()) {
     aura::Window* child = root_window->children()[0];
     delete child;
   }
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical.
-  app_list_controller_.reset();
   drag_drop_controller_.reset();
   event_client_.reset();
   magnification_controller_.reset();
   monitor_controller_.reset();
   power_button_controller_.reset();
   resize_shadow_controller_.reset();
   screen_dimmer_.reset();
   shadow_controller_.reset();
   tooltip_controller_.reset();
   window_cycle_controller_.reset();
@@ skipping 433 matching lines @@
 void Shell::SetCursor(gfx::NativeCursor cursor) {
   // TODO(oshima): set cursor to all root windows.
   GetPrimaryRootWindow()->SetCursor(cursor);
 }
 
 void Shell::ShowCursor(bool visible) {
   GetPrimaryRootWindow()->ShowCursor(visible);
 }
 
 }  // namespace ash