ash/app_list: Make applist bubble edge touch launcher bar edge.

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 153 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);
 
-  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",
       non_lock_screen_containers);
   modal_container->SetEventFilter(
       new ToplevelWindowEventFilter(modal_container));
   modal_container->SetLayoutManager(
       new internal::SystemModalContainerLayoutManager(modal_container));
   SetChildWindowVisibilityChangesAnimated(modal_container);
 
@@ skipping 862 matching lines @@
     panel_container->SetLayoutManager(panel_layout_manager_);
   }
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash