Refactor ProfileInfoCacheObserver interface and usage thereof.

chrome/browser/ui/webui/options/manage_profile_handler.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/ui/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 183 matching lines @@
       // Only log if they changed to the GAIA photo.
       // Selection of GAIA photo as avatar is logged as part of the function
       // below.
       ProfileMetrics::LogProfileSwitchGaia(ProfileMetrics::GAIA_OPT_IN);
     }
   } else if (cache.IsDefaultAvatarIconUrl(icon_url, &new_icon_index)) {
     PrefService* pref_service = profile->GetPrefs();
     ProfileMetrics::LogProfileAvatarSelection(new_icon_index);
     // Updating the profile preference will cause the cache to be updated for
     // this preference.
+    cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
     pref_service->SetInteger(prefs::kProfileAvatarIndex, new_icon_index);

[SteveT, 2011/12/22 02:59:07]

I had to make this switch because SetInteger(kProfileAvatarIndex,...) sends a
notification that triggers updating the shortcut... however if we haven't set
IsUsingGAIAPicture to false before doing that, GetAvatarIcon returns the GAIA
pic rather than the default icon and the shortcut is incorrectly badged.

[sail, 2011/12/22 04:03:11]

But wouldn't it eventually become correct once
SetIsUsingGAIAPictureOfProfileAtIndex() is called?

Does the shortcut manager have trouble if consecutive notifications are being
sent?

[SteveT, 2011/12/22 04:36:24]

Hm... So SetIsUsingGAIAPictureOfProfileAtIndex currently only notifies observers
if it is currently being set to true. I suppose with our new logic, we can have
it notify every time, instead.

That way (assuming we re-swamp the two above lines), the SetInteger call sets
the avatar index in place... and then the SetIsUsingGAIAPicture call triggers
the actual OnProfileAvatarChanged notification.

How does that sound?

[sail, 2011/12/22 04:48:28]

Really? That's weird. Similar to the name functions we should notify when ever
an API call will make an actual change.

[sail, 2011/12/22 04:48:28]

Sounds good. I'm not worried about the actual order of the calls. I was just
worried about the shortcut manager code being very fragile.

-    cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
   }
 
   ProfileMetrics::LogProfileUpdate(profile_file_path);
 }
 
 void ManageProfileHandler::DeleteProfile(const ListValue* args) {
   DCHECK(args);
 
   ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::PROFILE_DELETED);
 
@@ skipping 87 matching lines @@
   if (i == std::string::npos)
     return;
   string16 gaia_name = cache.GetGAIANameOfProfileAtIndex(i);
   if (gaia_name.empty())
     return;
 
   StringValue gaia_name_value(gaia_name);
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.setProfileName",
                                   gaia_name_value);
 }