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 252 matching lines @@
       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());
+    GetProfileInfoCache().AddObserver(profile_shortcut_manager_.get());

[sail, 2012/08/21 21:59:26]

Another way to do this would be to have ProfileShortcutManagerWin add itself as
an observer.

One benefit of this is that this way you wouldn't have to change the
ProfileShortcutManager interface.

[Halli, 2012/08/23 17:59:20]

Done.

 }
 
 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 664 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_->DeleteChromeDesktopShortcut(
+        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());
 }