Move ownership of the AppListViewDelegate into the AppListService

chrome/browser/ui/app_list/app_list_service_impl.cc

 // Copyright 2013 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/app_list/app_list_service_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/app_list/profile_loader.h"
 #include "chrome/browser/ui/app_list/profile_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 const int kDiscoverabilityTimeoutMinutes = 60;
 
@@ skipping 214 matching lines @@
     : profile_store_(profile_store.Pass()),
       command_line_(command_line),
       local_state_(local_state),
       profile_loader_(new ProfileLoader(profile_store_.get())),
       weak_factory_(this) {
   profile_store_->AddProfileObserver(this);
 }
 
 AppListServiceImpl::~AppListServiceImpl() {}
 
+AppListViewDelegate* AppListServiceImpl::GetViewDelegate(Profile* profile) {
+  if (!view_delegate_)
+    view_delegate_.reset(new AppListViewDelegate(GetControllerDelegate()));
+  view_delegate_->SetProfile(profile);
+  return view_delegate_.get();
+}
+
 void AppListServiceImpl::SetAppListNextPaintCallback(void (*callback)()) {}
 
 void AppListServiceImpl::HandleFirstRun() {}
 
 void AppListServiceImpl::Init(Profile* initial_profile) {}
 
 base::FilePath AppListServiceImpl::GetProfilePath(
     const base::FilePath& user_data_dir) {
   std::string app_list_profile;
   if (local_state_->HasPrefPath(prefs::kAppListProfile))
@@ skipping 31 matching lines @@
     return;
 
   // Switch the app list over to a valid profile.
   // Before ProfileInfoCache::DeleteProfileFromCache() calls this function,
   // ProfileManager::ScheduleProfileForDeletion() will have checked to see if
   // the deleted profile was also "last used", and updated that setting with
   // something valid.
   local_state_->SetString(prefs::kAppListProfile,
                           local_state_->GetString(prefs::kProfileLastUsed));
 
-  // The Chrome AppListViewDelegate now needs to be torn down, because:
+  // If the app list was never shown, there won't be a |view_delegate_| yet.
+  if (!view_delegate_)
+    return;
+
+  // The Chrome AppListViewDelegate now needs its profile cleared, because:
   //  1. it has many references to the profile and can't be profile-keyed, and
   //  2. the last used profile might not be loaded yet.
   //    - this loading is sometimes done by the ProfileManager asynchronously,
   //      so the app list can't just switch to that.
-  // Currently, the AppListViewDelegate is owned by the platform-specific
-  // AppListView, so just force-close the window.
+  // Only Mac supports showing the app list with a NULL profile, so tear down
+  // the view.
   DestroyAppList();
+  view_delegate_->SetProfile(NULL);
 }
 
 void AppListServiceImpl::Show() {
   profile_loader_->LoadProfileInvalidatingOtherLoads(
       GetProfilePath(profile_store_->GetUserDataDir()),
       base::Bind(&AppListServiceImpl::ShowForProfile,
                  weak_factory_.GetWeakPtr()));
 }
 
 void AppListServiceImpl::AutoShowForProfile(Profile* requested_profile) {
@@ skipping 52 matching lines @@
   if (!base::MessageLoop::current())
     return;  // In a unit test.
 
   // Send app list usage stats after a delay.
   const int kSendUsageStatsDelay = 5;
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AppListServiceImpl::SendAppListStats),
       base::TimeDelta::FromSeconds(kSendUsageStatsDelay));
 }