Ensure that use of GAIA names are considered when handling desktop shortcut changes.

chrome/browser/profiles/profile_info_cache.cc

 // Copyright (c) 2011 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/profiles/profile_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 211 matching lines @@
 
 void ProfileInfoCache::AddObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.AddObserver(obs);
 }
 
 void ProfileInfoCache::RemoveObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.RemoveObserver(obs);
 }
 
 void ProfileInfoCache::DeleteProfileFromCache(const FilePath& profile_path) {
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);

[sail, 2011/12/09 18:24:22]

can the next three lines be moved after the FOR_EACH_OBSERVER call?

[SteveT, 2011/12/09 18:37:56]

Rearranged the code here to be grouped more sensibly, and removed unnecessary
bits.

   DictionaryValue* cache = update.Get();
 
   std::string key = CacheKeyFromProfilePath(profile_path);
   DictionaryValue* info = NULL;

[sail, 2011/12/09 18:24:22]

do you still need this?

[SteveT, 2011/12/09 18:37:56]

No, nor do I need |index| below. That was a bit careless of me. Removed the
unnecessary stuff.

   cache->GetDictionary(key, &info);
-  string16 name;
-  info->GetString(kNameKey, &name);
+  string16 name = GetNameOfProfileAtIndex(
+      GetIndexOfProfileWithPath(profile_path));
+  size_t index = GetIndexOfProfileWithPath(profile_path);
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
                     OnProfileRemoved(name));
 
   cache->Remove(key, NULL);
   sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
@@ skipping 147 matching lines @@
   DLOG(WARNING) << "Unknown avatar icon: " << icon_url;
   return GetDefaultAvatarIconResourceIDAtIndex(0);
 }
 
 void ProfileInfoCache::SetNameOfProfileAtIndex(size_t index,
                                                const string16& name) {
   if (name == GetNameOfProfileAtIndex(index))
     return;
 
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
-  string16 old_name;
-  info->GetString(kNameKey, &old_name);
+  string16 old_name = GetNameOfProfileAtIndex(index);
   info->SetString(kNameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   UpdateSortForProfileIndex(index);
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
                     OnProfileNameChanged(old_name, name));
 }
 
 void ProfileInfoCache::SetUserNameOfProfileAtIndex(size_t index,
                                                    const string16& user_name) {
   if (user_name == GetUserNameOfProfileAtIndex(index))
     return;
 
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kUserNameKey, user_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 }
 
 void ProfileInfoCache::SetAvatarIconOfProfileAtIndex(size_t index,
                                                      size_t icon_index) {
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
-  string16 name;
-  info->GetString(kNameKey, &name);
   info->SetString(kAvatarIconKey, GetDefaultAvatarIconUrl(icon_index));
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
+  string16 name = GetNameOfProfileAtIndex(index);
   FilePath profile_path = GetPathOfProfileAtIndex(index);
   std::string key = CacheKeyFromProfilePath(profile_path);
   gfx::Image& avatar_img =
       ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           GetDefaultAvatarIconResourceIDAtIndex(icon_index));
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
                     OnProfileAvatarChanged(name, UTF8ToUTF16(key),
                                            profile_path, &avatar_img));
@@ skipping 21 matching lines @@
   SetInfoForProfileAtIndex(index, info.release());
   UpdateSortForProfileIndex(index);
 }
 
 void ProfileInfoCache::SetIsUsingGAIANameOfProfileAtIndex(size_t index,
                                                           bool value) {
   if (value == IsUsingGAIANameOfProfileAtIndex(index))
     return;
 
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
+  string16 old_name;
+  info->GetString(kNameKey, &old_name);
   info->SetBoolean(kUseGAIANameKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
+  string16 new_name = GetGAIANameOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
+
+  if (value) {
+    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
+                      observer_list_,
+                      OnProfileNameChanged(old_name, new_name));
+  }
 }
 
 void ProfileInfoCache::SetGAIAPictureOfProfileAtIndex(size_t index,
                                                       const gfx::Image* image) {
   FilePath path = GetPathOfProfileAtIndex(index);
   std::string key = CacheKeyFromProfilePath(path);
 
   // Delete the old bitmap from cache.
   std::map<std::string, gfx::Image*>::iterator it = gaia_pictures_.find(key);
   if (it != gaia_pictures_.end()) {
@@ skipping 33 matching lines @@
 
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAPictureFileNameKey, new_file_name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 }
 
 void ProfileInfoCache::SetIsUsingGAIAPictureOfProfileAtIndex(size_t index,
                                                              bool value) {
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
-  string16 name;
-  info->GetString(kNameKey, &name);
+  string16 name = GetNameOfProfileAtIndex(index);
   info->SetBoolean(kUseGAIAPictureKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   // Retrieve some info to update observers who care about avatar changes.
   if (value) {
     FilePath profile_path = GetPathOfProfileAtIndex(index);
     std::string key = CacheKeyFromProfilePath(profile_path);
     if (gaia_pictures_.find(key) != gaia_pictures_.end()) {
       FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
@@ skipping 212 matching lines @@
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }