Move ownership of the AppListViewDelegate into the AppListService

ash/wm/app_list_controller.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/wm/app_list_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
@@ skipping 169 matching lines @@
   is_visible_ = true;
 
   // App list needs to know the new shelf layout in order to calculate its
   // UI layout when AppListView visibility changes.
   Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager()->
       UpdateAutoHideState();
 
   if (view_) {
     ScheduleAnimation();
   } else {
-    // AppListModel and AppListViewDelegate are owned by AppListView. They
-    // will be released with AppListView on close.
+    // Note the AppListViewDelegate outlives the AppListView. For Ash, the view
+    // is destroyed when dismissed.
     app_list::AppListView* view = new app_list::AppListView(
-        Shell::GetInstance()->delegate()->CreateAppListViewDelegate());
+        Shell::GetInstance()->delegate()->GetAppListViewDelegate());
     aura::Window* root_window = window->GetRootWindow();
     aura::Window* container = GetRootWindowController(root_window)->
         GetContainer(kShellWindowId_AppListContainer);
     views::View* applist_button =
         Shelf::ForWindow(container)->GetAppListButtonView();
     is_centered_ = view->ShouldCenterWindow();
     if (is_centered_) {
       // Note: We can't center the app list until we have its dimensions, so we
       // init at (0, 0) and then reset its anchor point.
       view->InitAsBubbleAtFixedLocation(container,
@@ skipping 316 matching lines @@
   } else if (should_snap_back_) {
     should_snap_back_ = false;
     ui::ScopedLayerAnimationSettings animation(widget_animator);
     animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         app_list::kOverscrollPageTransitionDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace ash