Move ownership of the AppListViewDelegate into the AppListService

chrome/browser/ui/ash/chrome_shell_delegate.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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include "ash/content_support/gpu_support_impl.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
-#include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
-#include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
+#include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
@@ skipping 67 matching lines @@
   chrome::AttemptUserExit();
 }
 
 content::BrowserContext* ChromeShellDelegate::GetActiveBrowserContext() {
 #if defined(OS_CHROMEOS)
   DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
 #endif
   return ProfileManager::GetActiveUserProfile();
 }
 
-app_list::AppListViewDelegate*
-ChromeShellDelegate::CreateAppListViewDelegate() {
+app_list::AppListViewDelegate* ChromeShellDelegate::GetAppListViewDelegate() {
   DCHECK(ash::Shell::HasInstance());
-  // Shell will own the created delegate, and the delegate will own
-  // the controller.
-  return new AppListViewDelegate(
-      Profile::FromBrowserContext(GetActiveBrowserContext()),
-      AppListService::Get(chrome::HOST_DESKTOP_TYPE_ASH)->
-      GetControllerDelegate());
+  return AppListServiceAsh::GetInstance()->GetViewDelegate(
+      Profile::FromBrowserContext(GetActiveBrowserContext()));
 }
 
 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
     ash::ShelfModel* model) {
   if (!shelf_delegate_) {
     shelf_delegate_ = ChromeLauncherController::CreateInstance(NULL, model);
     shelf_delegate_->Init();
   }
   return shelf_delegate_;
 }
@@ skipping 35 matching lines @@
 
 void ChromeShellDelegate::AddVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.AddObserver(observer);
 }
 
 void ChromeShellDelegate::RemoveVirtualKeyboardStateObserver(
     ash::VirtualKeyboardStateObserver* observer) {
   keyboard_state_observer_list_.RemoveObserver(observer);
 }