Refactor ShellUtil shortcut code -- single multi-purpose methods as opposed to many slighlty diffe…

chrome/browser/profiles/profile_shortcut_manager_win.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 "chrome/browser/profiles/profile_shortcut_manager.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "chrome/installer/util/auto_launch_util.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/icon_util.h"
+#include "ui/gfx/image/image.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kProfileIconFileName[] = "Google Profile.ico";
 const int kProfileAvatarShortcutBadgeWidth = 28;
 const int kProfileAvatarShortcutBadgeHeight = 28;
 const int kShortcutIconSize = 48;
 
@@ skipping 68 matching lines @@
     const base::Callback<bool(void)>& bool_function) {
   bool_function.Run();
 }
 
 // Renames an existing Chrome desktop profile shortcut. Must be called on the
 // FILE thread.
 void RenameChromeDesktopShortcutForProfile(
     const string16& old_shortcut_file,
     const string16& new_shortcut_file) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   FilePath shortcut_path;
-  if (ShellUtil::GetDesktopPath(false,  // User's directory instead of system.
-                                &shortcut_path)) {
+  if (ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_DESKTOP, dist, false,
+                                 &shortcut_path)) {
     FilePath old_shortcut_path = shortcut_path.Append(old_shortcut_file);
     FilePath new_shortcut_path = shortcut_path.Append(new_shortcut_file);
     if (!file_util::Move(old_shortcut_path, new_shortcut_path))
        LOG(ERROR) << "Could not rename Windows profile desktop shortcut.";
   }
 }
 
 // Create or update a profile desktop shortcut. Must be called on the FILE
 // thread.
 void CreateOrUpdateProfileDesktopShortcut(
     const FilePath& profile_path,
     const string16& profile_name,
     const SkBitmap& avatar_image,
     bool create) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   FilePath shortcut_icon =
       CreateChromeDesktopShortcutIconForProfile(profile_path, avatar_image);
 
   FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe))
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
     return;
+  }
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  if (!dist)
+  if (!dist) {
+    NOTREACHED();

[robertshield, 2012/10/02 13:08:04]

we don't check the return value of GetDistribution in most places (we assume it
can never return null). 

[gab, 2012/10/03 15:14:59]

True, removed!

     return;
-  string16 description(dist->GetAppDescription());
+  }
 
-  uint32 options = create ? ShellUtil::SHORTCUT_CREATE_ALWAYS :
-                            ShellUtil::SHORTCUT_NO_OPTIONS;
-  ShellUtil::CreateChromeDesktopShortcut(
-      dist,
-      chrome_exe.value(),
-      description,
-      profile_name,
-      CreateProfileShortcutFlags(profile_path),
-      shortcut_icon.empty() ? chrome_exe.value() : shortcut_icon.value(),
-      shortcut_icon.empty() ? dist->GetIconIndex() : 0,
-      ShellUtil::CURRENT_USER,
-      options);
+  ShellUtil::ChromeShortcutProperties properties;
+  properties.set_target(chrome_exe);
+  properties.set_arguments(CreateProfileShortcutFlags(profile_path));
+  if (!shortcut_icon.empty())
+    properties.set_icon(shortcut_icon);
+  properties.set_shortcut_name(
+      ProfileShortcutManager::GetShortcutNameForProfile(profile_name));
+  ShellUtil::ChromeShortcutOperation operation =
+      create ? ShellUtil::SHORTCUT_CREATE_ALWAYS :
+               ShellUtil::SHORTCUT_REPLACE_EXISTING;
+  ShellUtil::CreateOrUpdateChromeShortcut(
+      ShellUtil::SHORTCUT_DESKTOP, dist, properties, operation);
 }
 
 }  // namespace
 
 class ProfileShortcutManagerWin : public ProfileShortcutManager,
                                   public ProfileInfoCacheObserver {
  public:
   explicit ProfileShortcutManagerWin(ProfileManager* manager);
   virtual ~ProfileShortcutManagerWin();
 
@@ skipping 26 matching lines @@
 bool ProfileShortcutManager::IsFeatureEnabled() {
   return false;
 }
 
 // static
 ProfileShortcutManager* ProfileShortcutManager::Create(
     ProfileManager* manager) {
   return new ProfileShortcutManagerWin(manager);
 }
 
+// static
+string16 ProfileShortcutManager::GetShortcutNameForProfile(
+    const string16& profile_name) {
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  string16 shortcut_name(dist->GetAppShortCutName());
+  shortcut_name.append(L" (");
+  shortcut_name.append(profile_name);
+  shortcut_name.append(L")");
+  return shortcut_name;
+}
+
 ProfileShortcutManagerWin::ProfileShortcutManagerWin(ProfileManager* manager)
     : profile_manager_(manager) {
     profile_manager_->GetProfileInfoCache().AddObserver(this);
 }
 
 ProfileShortcutManagerWin::~ProfileShortcutManagerWin() {
     profile_manager_->GetProfileInfoCache().RemoveObserver(this);
 }
 
 void ProfileShortcutManagerWin::CreateProfileShortcut(
@@ skipping 24 matching lines @@
     UpdateShortcutForProfileAtPath(
         profile_manager_->GetProfileInfoCache().GetPathOfProfileAtIndex(0),
         false);
   }
 
   string16 profile_name_updated;
   if (profile_manager_->GetProfileInfoCache().GetNumberOfProfiles() != 0)
     profile_name_updated = profile_name;
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 shortcut;
-  // If we can find the shortcut, delete it
-  if (ShellUtil::GetChromeShortcutName(dist, false,
-          profile_name_updated, &shortcut)) {
-    std::vector<string16> appended_names(1, shortcut);
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-            base::Bind(&CallBoolFunction, base::Bind(
-                &ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames,
-                appended_names)));
-  }
+  ShellUtil::ChromeShortcutProperties shortcut_properties;
+  shortcut_properties.set_shortcut_name(
+      GetShortcutNameForProfile(profile_name_updated));
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+          base::Bind(&CallBoolFunction, base::Bind(
+              &ShellUtil::RemoveChromeShortcut, ShellUtil::SHORTCUT_DESKTOP,
+              dist, shortcut_properties)));
+
   FilePath icon_path = profile_path.AppendASCII(kProfileIconFileName);
   BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
             base::Bind(&CallBoolFunction, base::Bind(
                 &file_util::Delete, icon_path, false)));
 }
 
 void ProfileShortcutManagerWin::OnProfileNameChanged(
     const FilePath& profile_path,
     const string16& old_profile_name) {
@@ skipping 12 matching lines @@
       GetIndexOfProfileWithPath(profile_path);
   if (profile_index == std::string::npos)
       return;
   // If the shortcut will have an appended name, get the profile name.
   string16 new_profile_name =
       (profile_manager_->GetProfileInfoCache().GetNumberOfProfiles() == 1) ?
           string16() :
           profile_manager_->GetProfileInfoCache().
               GetNameOfProfileAtIndex(profile_index);
 
-  string16 old_shortcut_file;
-  string16 new_shortcut_file;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  if (ShellUtil::GetChromeShortcutName(
-          dist, false, old_profile_name, &old_shortcut_file) &&
-      ShellUtil::GetChromeShortcutName(
-          dist, false, new_profile_name, &new_shortcut_file)) {
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&RenameChromeDesktopShortcutForProfile,
-                   old_shortcut_file,
-                   new_shortcut_file));
-  }
+  string16 old_shortcut_file(GetShortcutNameForProfile(old_profile_name));
+  string16 new_shortcut_file(GetShortcutNameForProfile(new_profile_name));
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::Bind(&RenameChromeDesktopShortcutForProfile,
+                 old_shortcut_file,
+                 new_shortcut_file));
 }
 
 FilePath ProfileShortcutManagerWin::GetOtherProfilePath(
     const FilePath& profile_path) {
   DCHECK_EQ(2U, profile_manager_->GetProfileInfoCache().GetNumberOfProfiles());
   // Get the index of the current profile, in order to find the index of the
   // other profile.
   size_t current_profile_index = profile_manager_->GetProfileInfoCache().
     GetIndexOfProfileWithPath(profile_path);
   size_t other_profile_index = (current_profile_index == 0) ? 1 : 0;
@@ skipping 45 matching lines @@
   }
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateOrUpdateProfileDesktopShortcut,
                  profile_path, new_shortcut_appended_name,
                  profile_avatar_bitmap_copy, create_always));
 
   profile_manager_->GetProfileInfoCache().SetShortcutNameOfProfileAtIndex(
       profile_index, new_shortcut_appended_name);
 }