Merge 115621 - Refactor ProfileInfoCacheObserver interface and usage thereof.

chrome/browser/profiles/profile_shortcut_manager_win.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_shortcut_manager_win.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 197 matching lines @@
 
 }  // namespace
 
 ProfileShortcutManagerWin::ProfileShortcutManagerWin() {
 }
 
 ProfileShortcutManagerWin::~ProfileShortcutManagerWin() {
 }
 
 void ProfileShortcutManagerWin::OnProfileAdded(
-    const string16& profile_name,
-    const string16& profile_base_dir,
-    const FilePath& profile_path,
-    const gfx::Image* avatar_image) {
+    const FilePath& profile_path) {
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
+
   // Launch task to add shortcut to desktop on Windows. If this is the very
   // first profile created, don't add the user name to the shortcut.
   // TODO(mirandac): respect master_preferences choice to create no shortcuts
   // (see http://crbug.com/104463)
   if (g_browser_process->profile_manager()->GetNumberOfProfiles() > 1) {
     {
       // We make a copy of the Image to ensure that the underlying image data is
       // AddRef'd, in case the original copy gets deleted.
-      gfx::Image* avatar_copy = avatar_image ?
-          new gfx::Image(*avatar_image) : NULL;
+      gfx::Image* avatar_copy =
+          new gfx::Image(cache.GetAvatarIconOfProfileAtIndex(index));
+      string16 profile_name = cache.GetNameOfProfileAtIndex(index);
+      string16 profile_base_dir = profile_path.BaseName().value();
       BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
           base::Bind(&CreateChromeDesktopShortcutForProfile,
                      profile_name, profile_base_dir, profile_path,
                      base::Owned(avatar_copy), true));
     }
 
     // If this is the second existing multi-user account created, change the
     // original shortcut use the first profile's details (name, badge,
     // argument).
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
     if (cache.GetNumberOfProfiles() == 2) {
       // Get the index of the first profile, based on the index of the second
       // profile. It's either 0 or 1, whichever the second profile isn't.
       size_t first_index = 0;
       if (cache.GetIndexOfProfileWithPath(profile_path) == 0)
         first_index = 1;
       string16 first_name = cache.GetNameOfProfileAtIndex(first_index);
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
 
       string16 old_shortcut;
@@ skipping 26 matching lines @@
       }
     }
   } else {  // Only one profile, so create original shortcut, with no avatar.
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&CreateChromeDesktopShortcutForProfile,
                    L"", L"", FilePath(), static_cast<gfx::Image*>(NULL), true));
   }
 }
 
 void ProfileShortcutManagerWin::OnProfileWillBeRemoved(
-    const string16& profile_name) {
+    const FilePath& profile_path) {
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  string16 profile_name = cache.GetNameOfProfileAtIndex(
+      cache.GetIndexOfProfileWithPath(profile_path));
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   string16 shortcut;
   if (ShellUtil::GetChromeShortcutName(dist, false, profile_name, &shortcut)) {
     std::vector<string16> shortcuts(1, shortcut);
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&CallShellUtilBoolFunction,
             base::Bind(
                 &ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames,
                 shortcuts)));
   }
 }
 
 void ProfileShortcutManagerWin::OnProfileWasRemoved(
+    const FilePath& profile_path,
     const string16& profile_name) {
   // If there is one profile left, we want to remove the badge and name from it.
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   if (cache.GetNumberOfProfiles() != 1)
     return;
 
-  // TODO(stevet): Now that we've sunk our fangs onto ProfileInfoCache, we
-  // should clean up the ProfileInfoCacheObserver interface and its users
-  // (including us) to not pass every parameter through and instead query the
-  // cache when needed.
-  FilePath profile_path = cache.GetPathOfProfileAtIndex(0);
+  FilePath last_profile_path = cache.GetPathOfProfileAtIndex(0);
   string16 old_shortcut;
   string16 new_shortcut;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (ShellUtil::GetChromeShortcutName(
           dist, false, cache.GetNameOfProfileAtIndex(0), &old_shortcut) &&
       ShellUtil::GetChromeShortcutName(
           dist, false, L"", &new_shortcut)) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&RenameChromeDesktopShortcutForProfile,
                    old_shortcut,
                    new_shortcut));
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&UpdateChromeDesktopShortcutForProfile,
                    new_shortcut,
                    CreateProfileShortcutSwitch(UTF8ToUTF16(
-                       profile_path.BaseName().MaybeAsASCII())),
-                   profile_path,
+                       last_profile_path.BaseName().MaybeAsASCII())),
+                   last_profile_path,
                    static_cast<gfx::Image*>(NULL)));
   }
 }
 
 void ProfileShortcutManagerWin::OnProfileNameChanged(
-    const string16& old_profile_name,
-    const string16& new_profile_name) {
+    const FilePath& profile_path,
+    const string16& old_profile_name) {
   // Launch task to change name of desktop shortcut on Windows.
   // TODO(mirandac): respect master_preferences choice to create no shortcuts
   // (see http://crbug.com/104463)
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  string16 new_profile_name = cache.GetNameOfProfileAtIndex(
+      cache.GetIndexOfProfileWithPath(profile_path));
+
   string16 old_shortcut;
   string16 new_shortcut;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (ShellUtil::GetChromeShortcutName(
           dist, false, old_profile_name, &old_shortcut) &&
       ShellUtil::GetChromeShortcutName(
           dist, false, new_profile_name, &new_shortcut)) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&RenameChromeDesktopShortcutForProfile,
                    old_shortcut,
                    new_shortcut));
   }
 }
 
 void ProfileShortcutManagerWin::OnProfileAvatarChanged(
-      const string16& profile_name,
-      const string16& profile_base_dir,
-      const FilePath& profile_path,
-      const gfx::Image* avatar_image) {
+      const FilePath& profile_path) {
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
+  string16 profile_name = cache.GetNameOfProfileAtIndex(index);
+  string16 profile_base_dir =
+      UTF8ToUTF16(profile_path.BaseName().MaybeAsASCII());
+  const gfx::Image& avatar_image = cache.GetAvatarIconOfProfileAtIndex(index);
+
   // Launch task to change the icon of the desktop shortcut on windows.
   string16 new_shortcut;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (ShellUtil::GetChromeShortcutName(dist, false, profile_name,
                                        &new_shortcut)) {
     // We make a copy of the Image to ensure that the underlying image data is
     // AddRef'd, in case the original copy gets deleted.
-    gfx::Image* avatar_copy = avatar_image ?
-        new gfx::Image(*avatar_image) : NULL;
+    gfx::Image* avatar_copy = new gfx::Image(avatar_image);
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         base::Bind(&UpdateChromeDesktopShortcutForProfile,
                    new_shortcut,
                    CreateProfileShortcutSwitch(profile_base_dir),
                    profile_path,
                    base::Owned(avatar_copy)));
   }
 }
 
 // static
 std::vector<string16> ProfileShortcutManagerWin::GenerateShortcutsFromProfiles(
     const std::vector<string16>& profile_names) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::vector<string16> shortcuts;
   shortcuts.reserve(profile_names.size());
   for (std::vector<string16>::const_iterator it = profile_names.begin();
        it != profile_names.end();
        ++it) {
     string16 shortcut;
     if (ShellUtil::GetChromeShortcutName(dist, false, *it, &shortcut))
       shortcuts.push_back(shortcut);
   }
   return shortcuts;
 }