Update profile desktop shortcuts

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 251 matching lines @@
   registrar_.Add(
       this,
       chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
       content::NotificationService::AllSources());
   registrar_.Add(
       this,
       chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
       content::NotificationService::AllSources());
 
   if (ProfileShortcutManager::IsFeatureEnabled())
-    profile_shortcut_manager_.reset(ProfileShortcutManager::Create());
+    profile_shortcut_manager_.reset(ProfileShortcutManager::Create(
+                                    GetProfileInfoCache()));
 }
 
 ProfileManager::~ProfileManager() {
 }
 
 FilePath ProfileManager::GetDefaultProfileDir(
     const FilePath& user_data_dir) {
   FilePath default_profile_dir(user_data_dir);
   default_profile_dir =
       default_profile_dir.AppendASCII(chrome::kInitialProfile);
@@ skipping 166 matching lines @@
     // Get the icon index from the user's icon url
     size_t icon_index;
     std::string icon_url_std = UTF16ToASCII(icon_url);
     if (cache.IsDefaultAvatarIconUrl(icon_url_std, &icon_index)) {
       // add profile to cache with user selected name and avatar
       cache.AddProfileToCache(profile_path, name, string16(), icon_index);
     }
     info->callbacks.push_back(callback);
     if (profile_shortcut_manager_.get() && !name.empty() &&
         !icon_url.empty()) {
-      BrowserThread::PostTask(
-          BrowserThread::FILE, FROM_HERE,
-          base::Bind(&ProfileShortcutManager::CreateChromeDesktopShortcut,
-          base::Unretained(profile_shortcut_manager_.get()), profile_path, name,
+      profile_shortcut_manager_->StartProfileDesktopShortcutCreation(
+          profile_path, name,
           ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-              cache.GetDefaultAvatarIconResourceIDAtIndex(icon_index))));
+              cache.GetDefaultAvatarIconResourceIDAtIndex(icon_index)));
     }
   }
 }
 
 // static
 void ProfileManager::CreateDefaultProfileAsync(const CreateCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ProfileManager* profile_manager = g_browser_process->profile_manager();
 
   FilePath default_profile_dir = profile_manager->user_data_dir_;
@@ skipping 472 matching lines @@
     BrowserList::CloseAllBrowsersWithProfile(profile);
 
     // Disable sync for doomed profile.
     if (ProfileSyncServiceFactory::GetInstance()->HasProfileSyncService(
         profile)) {
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           profile)->DisableForUser();
     }
   }
 
+  // Delete possible shortcuts for this profile
+  if (profile_shortcut_manager_.get())
+    profile_shortcut_manager_->DeleteProfileDesktopShortcut(
+        profile_dir, cache.GetNameOfProfileAtIndex(
+        cache.GetIndexOfProfileWithPath(profile_dir)));
+
   QueueProfileDirectoryForDeletion(profile_dir);
   cache.DeleteProfileFromCache(profile_dir);
 
-  // Delete possible shortcuts for this profile
-  if (profile_shortcut_manager_.get())
-    profile_shortcut_manager_->DeleteChromeDesktopShortcut(profile_dir);
-
   ProfileMetrics::LogNumberOfProfiles(this,
                                       ProfileMetrics::DELETE_PROFILE_EVENT);
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))
     return false;
 #endif
@@ skipping 40 matching lines @@
 }
 
 ProfileManager::ProfileInfo::ProfileInfo(Profile* profile, bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }