[win] Set the profile path when enabling the app launcher.

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 "apps/pref_names.h"
+#include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 
 void SendAppListAppLaunch(int count) {
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Apps.AppListDailyAppLaunches", count, 1, 1000, 50);
@@ skipping 35 matching lines @@
     void (*send_callback)(int count)) {
   PrefService* local_state = g_browser_process->local_state();
 
   int count = local_state->GetInteger(count_pref);
   local_state->SetInteger(count_pref, count + 1);
   if (SendDailyEventFrequency(last_ping_pref, count_pref, send_callback)) {
     local_state->SetInteger(count_pref, 1);
   }
 }
 
+void SetAppListEnabledPreference(bool enabled) {
+  PrefService* local_state = g_browser_process->local_state();
+  local_state->SetBoolean(apps::prefs::kAppLauncherHasBeenEnabled, enabled);
+}
+
 }  // namespace
 
 // static
 void AppListServiceImpl::RecordAppListLaunch() {
   RecordDailyEventFrequency(prefs::kLastAppListLaunchPing,
                             prefs::kAppListLaunchCount,
                             &SendAppListLaunch);
 }
 
 // static
@@ skipping 42 matching lines @@
   // If the user has no profile preference for the app launcher, default to the
   // last browser profile used.
   if (app_list_profile.empty() &&
       local_state->HasPrefPath(prefs::kProfileLastUsed))
     app_list_profile = local_state->GetString(prefs::kProfileLastUsed);
 
   std::string profile_path = app_list_profile.empty() ?
       chrome::kInitialProfile :
       app_list_profile;
 
-  return user_data_dir.AppendASCII(profile_path);
+  if (!user_data_dir.empty())
+    return user_data_dir.AppendASCII(profile_path);
+
+  return g_browser_process->profile_manager()->
+      user_data_dir().AppendASCII(profile_path);
+}
+
+void AppListServiceImpl::SetProfilePath(const base::FilePath& profile_path) {
+  g_browser_process->local_state()->SetString(
+      prefs::kAppListProfile,
+      profile_path.BaseName().MaybeAsASCII());
 }
 
 AppListControllerDelegate* AppListServiceImpl::CreateControllerDelegate() {
   return NULL;
 }
 
+void AppListServiceImpl::CreateShortcut() {}
 void AppListServiceImpl::OnSigninStatusChanged() {}
 
 // We need to watch for profile removal to keep kAppListProfile updated.
 void AppListServiceImpl::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {
   // If the profile the app list uses just got deleted, reset it to the last
   // used profile.
   PrefService* local_state = g_browser_process->local_state();
   std::string app_list_last_profile = local_state->GetString(
       prefs::kAppListProfile);
   if (profile_path.BaseName().MaybeAsASCII() == app_list_last_profile) {
     local_state->SetString(prefs::kAppListProfile,
         local_state->GetString(prefs::kProfileLastUsed));
   }
 }
 
 void AppListServiceImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   OnSigninStatusChanged();
 }
 
-void AppListServiceImpl::SetAppListProfile(
-    const base::FilePath& profile_file_path) {
+void AppListServiceImpl::ShowForSavedProfile() {
   profile_loader_.LoadProfileInvalidatingOtherLoads(
-      profile_file_path, base::Bind(&AppListServiceImpl::ShowAppList,
-                                    weak_factory_.GetWeakPtr()));
+      GetProfilePath(base::FilePath()),
+      base::Bind(&AppListServiceImpl::ShowAppList, weak_factory_.GetWeakPtr()));
 }
 
-void AppListServiceImpl::ShowForSavedProfile() {
-  SetAppListProfile(GetProfilePath(
-      g_browser_process->profile_manager()->user_data_dir()));
+void AppListServiceImpl::EnableAppList(Profile* initial_profile) {
+  SetAppListEnabledPreference(true);
+  SetProfilePath(initial_profile->GetPath());
+  CreateShortcut();
 }
 
 Profile* AppListServiceImpl::GetCurrentAppListProfile() {
   return profile();
 }
 
 void AppListServiceImpl::SetProfile(Profile* new_profile) {
   registrar_.RemoveAll();
   profile_ = new_profile;
   if (!profile_)
     return;
 
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                  content::Source<Profile>(profile_));
 }
 
 void AppListServiceImpl::InvalidatePendingProfileLoads() {
   profile_loader_.InvalidatePendingProfileLoads();
 }
 
-void AppListServiceImpl::SaveProfilePathToLocalState(
-    const base::FilePath& profile_file_path) {
-  g_browser_process->local_state()->SetString(
-      prefs::kAppListProfile,
-      profile_file_path.BaseName().MaybeAsASCII());
+void AppListServiceImpl::SharedDesktopInit(Profile* initial_profile) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppList))
+    EnableAppList(initial_profile);
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppList))
+    SetAppListEnabledPreference(false);
 }