Move ownership of the AppListViewDelegate into the AppListService

ash/shell/shell_delegate_impl.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/shell_delegate_impl.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/default_accessibility_delegate.h"
 #include "ash/default_user_wallpaper_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/keyboard_controller_proxy_stub.h"
 #include "ash/shell/shelf_delegate_impl.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/user_manager/user_info_impl.h"
+#include "ui/app_list/app_list_view_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/input_method_event_filter.h"
 
 namespace ash {
 namespace shell {
 namespace {
 
 class NewWindowDelegateImpl : public NewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
@@ skipping 170 matching lines @@
 }
 
 void ShellDelegateImpl::RemoveVirtualKeyboardStateObserver(
     VirtualKeyboardStateObserver* observer) {
 }
 
 content::BrowserContext* ShellDelegateImpl::GetActiveBrowserContext() {
   return browser_context_;
 }
 
-app_list::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() {
-  return ash::shell::CreateAppListViewDelegate();
+app_list::AppListViewDelegate* ShellDelegateImpl::GetAppListViewDelegate() {
+  if (!app_list_view_delegate_)
+    app_list_view_delegate_.reset(ash::shell::CreateAppListViewDelegate());
+  return app_list_view_delegate_.get();
 }
 
 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
   shelf_delegate_ = new ShelfDelegateImpl(watcher_);
   return shelf_delegate_;
 }
 
 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
   return new DefaultSystemTrayDelegate;
 }
@@ skipping 29 matching lines @@
   // Real GPU support depends on src/content, so just use a stub.
   return new GPUSupportStub;
 }
 
 base::string16 ShellDelegateImpl::GetProductName() const {
   return base::string16();
 }
 
 }  // namespace shell
 }  // namespace ash