Create and delete desktop shortcuts in general.

Currently planning 6 steps for this feature:
1. (this step) Create/delete shortcuts in general (few edge cases)
2. Add functionality for the checkbox- allow the user to select whether they want a shortcut or not from the create/manage profile dialogs
3. Find shortcuts on the desktop by their arguments instead of the path.
4. Handle edge case of 1 to 2 and 2 to 1 profiles (adding/removing icon and name from the shortcut)
5. Update shortcuts when the user changes their name/icon
6. Repopulate shortcuts map when browser starts up (to allow delete/update on new browser instances) 

This CL depends on: Issue 10826188

BUG=133585
TEST=manual testing

Review URL: https://chromiumcodereview.appspot.com/10823217

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151974 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main_win.cc

@@ -25,7 +25,7 @@
 #include "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_shortcut_manager_win.h"
+#include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
 #include "chrome/common/chrome_constants.h"
@@ -132,11 +132,7 @@ int DoUninstallTasks(bool chrome_still_running) {
             dist, ShellUtil::CURRENT_USER, ShellUtil::SHORTCUT_NO_OPTIONS)) {
       VLOG(1) << "Failed to delete desktop shortcut.";
     }
-    if (!ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames(
-        ProfileShortcutManagerWin::GenerateShortcutsFromProfiles(
-            ProfileInfoCache::GetProfileNames()))) {
-      VLOG(1) << "Failed to delete desktop profiles shortcuts.";
-    }
+    // TODO(hallielaine): Cleanup profiles shortcuts.
     if (!ShellUtil::RemoveChromeQuickLaunchShortcut(dist,
                                                     ShellUtil::CURRENT_USER)) {
       VLOG(1) << "Failed to delete quick launch shortcut.";

chrome/browser/profiles/avatar_menu_model.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
@@ -102,7 +103,21 @@ void AvatarMenuModel::EditProfile(size_t index) {
 }
 
 void AvatarMenuModel::AddNewProfile() {
+  // Temporarily generate a random icon/name pair to create the profile with
+  // instead of opening a dialog for creating a profile.
+  // Remove on completion of BUG 134904.
+  if (ProfileShortcutManager::IsFeatureEnabled()) {
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
+    size_t icon_index = cache.ChooseAvatarIconIndexForNewProfile();
+
+    g_browser_process->profile_manager()->CreateMultiProfileAsync(
+        cache.ChooseNameForNewProfile(icon_index),
+        ASCIIToUTF16(cache.GetDefaultAvatarIconUrl(icon_index)));
+  } else {
     ProfileManager::CreateMultiProfileAsync(string16(), string16());
+  }
+
   ProfileMetrics::LogProfileAddNewUser(ProfileMetrics::ADD_NEW_USER_ICON);
 }
 

chrome/browser/profiles/profile_manager.cc

@@ -239,6 +239,7 @@ ProfileManager::ProfileManager(const FilePath& user_data_dir)
     : user_data_dir_(user_data_dir),
       logged_in_(false),
       will_import_(false),
+      profile_shortcut_manager_(NULL),
 #if !defined(OS_ANDROID)
       ALLOW_THIS_IN_INITIALIZER_LIST(
           browser_list_observer_(this)),
@@ -266,13 +267,12 @@ ProfileManager::ProfileManager(const FilePath& user_data_dir)
       this,
       chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
       content::NotificationService::AllSources());
+
+  if (ProfileShortcutManager::IsFeatureEnabled())
+    profile_shortcut_manager_.reset(ProfileShortcutManager::Create());
 }
 
 ProfileManager::~ProfileManager() {
-#if defined(OS_WIN)
-  if (profile_shortcut_manager_.get())
-    profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
-#endif
 }
 
 FilePath ProfileManager::GetDefaultProfileDir(
@@ -454,6 +454,15 @@ void ProfileManager::CreateProfileAsync(const FilePath& profile_path,
       cache.AddProfileToCache(profile_path, name, string16(), icon_index);
     }
     info->callbacks.push_back(callback);
+    if (profile_shortcut_manager_.get() && !name.empty() &&
+        !icon_url.empty()) {
+      BrowserThread::PostTask(
+          BrowserThread::FILE, FROM_HERE,
+          base::Bind(&ProfileShortcutManager::CreateChromeDesktopShortcut,
+          base::Unretained(profile_shortcut_manager_.get()), profile_path, name,
+          ResourceBundle::GetSharedInstance().GetNativeImageNamed(
+              cache.GetDefaultAvatarIconResourceIDAtIndex(icon_index))));
+    }
   }
 }
 
@@ -680,9 +689,6 @@ void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
   InitProfileUserPrefs(profile);
   AddProfileToCache(profile);
   DoFinalInitLogging(profile);
-#if defined(OS_WIN)
-  CreateDesktopShortcut(profile);
-#endif
 
   ProfileMetrics::LogNumberOfProfiles(this, ProfileMetrics::ADD_PROFILE_EVENT);
   content::NotificationService::current()->Notify(
@@ -732,12 +738,6 @@ Profile* ProfileManager::CreateProfileAsyncHelper(const FilePath& path,
                                 Profile::CREATE_MODE_ASYNCHRONOUS);
 }
 
-#if defined(OS_WIN)
-ProfileShortcutManagerWin* ProfileManager::CreateShortcutManager() {
-  return new ProfileShortcutManagerWin();
-}
-#endif
-
 void ProfileManager::OnProfileCreated(Profile* profile,
                                       bool success,
                                       bool is_new_profile) {
@@ -838,16 +838,6 @@ ProfileInfoCache& ProfileManager::GetProfileInfoCache() {
   if (!profile_info_cache_.get()) {
     profile_info_cache_.reset(new ProfileInfoCache(
         g_browser_process->local_state(), user_data_dir_));
-#if defined(OS_WIN)
-    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    ProfileShortcutManagerWin* shortcut_manager = CreateShortcutManager();
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (dist && dist->CanCreateDesktopShortcuts() && shortcut_manager &&
-        !command_line.HasSwitch(switches::kDisableDesktopShortcuts)) {
-      profile_shortcut_manager_.reset(shortcut_manager);
-      profile_info_cache_->AddObserver(profile_shortcut_manager_.get());
-    }
-#endif
   }
   return *profile_info_cache_.get();
 }
@@ -877,28 +867,6 @@ void ProfileManager::AddProfileToCache(Profile* profile) {
                           icon_index);
 }
 
-#if defined(OS_WIN)
-void ProfileManager::CreateDesktopShortcut(Profile* profile) {
-  // TODO(sail): Disable creating new shortcuts for now.
-  return;
-
-  // Some distributions and tests cannot create desktop shortcuts, in which case
-  // profile_shortcut_manager_ will not be set.
-  if (!profile_shortcut_manager_.get())
-    return;
-
-  bool shortcut_created =
-      profile->GetPrefs()->GetBoolean(prefs::kProfileShortcutCreated);
-  if (!shortcut_created && GetNumberOfProfiles() > 1) {
-    profile_shortcut_manager_->AddProfileShortcut(profile->GetPath());
-
-    // We only ever create the shortcut for a profile once, so set a pref
-    // reminding us to skip this in the future.
-    profile->GetPrefs()->SetBoolean(prefs::kProfileShortcutCreated, true);
-  }
-}
-#endif
-
 void ProfileManager::InitProfileUserPrefs(Profile* profile) {
   ProfileInfoCache& cache = GetProfileInfoCache();
 
@@ -989,6 +957,10 @@ void ProfileManager::ScheduleProfileForDeletion(const FilePath& 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);
 }

chrome/browser/profiles/profile_manager.h

@@ -19,15 +19,12 @@
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/profiles/profile_shortcut_manager_win.h"
-#endif
-
 class NewProfileLauncher;
 class ProfileInfoCache;
 
@@ -209,12 +206,6 @@ class ProfileManager : public base::NonThreadSafe,
   virtual Profile* CreateProfileAsyncHelper(const FilePath& path,
                                             Delegate* delegate);
 
-#if defined(OS_WIN)
-  // Creates a shortcut manager. Override this to return a different shortcut
-  // manager or NULL to avoid creating shortcuts.
-  virtual ProfileShortcutManagerWin* CreateShortcutManager();
-#endif
-
  private:
   friend class TestingProfileManager;
   FRIEND_TEST_ALL_PREFIXES(ProfileManagerBrowserTest, DeleteAllProfiles);
@@ -258,12 +249,6 @@ class ProfileManager : public base::NonThreadSafe,
   // Adds |profile| to the profile info cache if it hasn't been added yet.
   void AddProfileToCache(Profile* profile);
 
-#if defined(OS_WIN)
-  // Creates a profile desktop shortcut for |profile| if we are in multi
-  // profile mode and the shortcut has not been created before.
-  void CreateDesktopShortcut(Profile* profile);
-#endif
-
   // Initializes user prefs of |profile|. This includes profile name and
   // avatar values
   void InitProfileUserPrefs(Profile* profile);
@@ -306,11 +291,8 @@ class ProfileManager : public base::NonThreadSafe,
   // if it has not been explicitly deleted.
   scoped_ptr<ProfileInfoCache> profile_info_cache_;
 
-#if defined(OS_WIN)
-  // Manages the creation, deletion, and renaming of Windows shortcuts by
-  // observing the ProfileInfoCache.
-  scoped_ptr<ProfileShortcutManagerWin> profile_shortcut_manager_;
-#endif
+  // Manages the process of creating, deleteing and updating Desktop shortcuts.
+  scoped_ptr<ProfileShortcutManager> profile_shortcut_manager_;
 
 #if !defined(OS_ANDROID)
   class BrowserListObserver : public chrome::BrowserListObserver {

chrome/browser/profiles/profile_manager_unittest.cc

@@ -77,13 +77,6 @@ class ProfileManager : public ::ProfileManagerWithoutInit {
 
     return new TestingProfile(path, this);
   }
-
-#if defined(OS_WIN)
-  virtual ProfileShortcutManagerWin* CreateShortcutManager() OVERRIDE {
-    // We should avoid creating shortcuts in these tests.
-    return NULL;
-  }
-#endif
 };
 
 }  // namespace testing
@@ -117,8 +110,9 @@ class ProfileManagerTest : public testing::Test {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetProfileManager(
         new testing::ProfileManager(temp_dir_.path()));
+
 #if defined(OS_CHROMEOS)
-  CommandLine *cl = CommandLine::ForCurrentProcess();
+  CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kTestType);
 #endif
   }
@@ -287,13 +281,16 @@ TEST_F(ProfileManagerTest, CreateProfileAsyncMultipleRequests) {
 
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer1)), string16(), string16());
+                 base::Unretained(&mock_observer1)),
+                 string16(), string16());
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer2)), string16(), string16());
+                 base::Unretained(&mock_observer2)),
+                 string16(), string16());
   profile_manager->CreateProfileAsync(dest_path,
       base::Bind(&MockObserver::OnProfileCreated,
-                 base::Unretained(&mock_observer3)), string16(), string16());
+                 base::Unretained(&mock_observer3)),
+                 string16(), string16());
 
   message_loop_.RunAllPending();
 }

chrome/browser/profiles/profile_shortcut_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 "chrome/browser/profiles/profile_shortcut_manager.h"
+
+ProfileShortcutManager::~ProfileShortcutManager() {
+}
+
+ProfileShortcutManager::ProfileShortcutManager() {
+}

chrome/browser/profiles/profile_shortcut_manager.h

+// 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.
+
+#ifndef CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_
+#define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_
+
+#include "base/file_path.h"
+#include "ui/gfx/image/image.h"
+
+class ProfileShortcutManager {
+ public:
+  virtual ~ProfileShortcutManager();
+
+  static bool IsFeatureEnabled();
+  static ProfileShortcutManager* Create();
+
+  virtual void CreateChromeDesktopShortcut(
+      const FilePath& profile_path, const string16& profile_name,
+      const gfx::Image& avatar_image) = 0;
+  virtual void DeleteChromeDesktopShortcut(const FilePath& profile_path) = 0;
+
+ protected:
+  ProfileShortcutManager();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManager);
+};
+
+#endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_H_

chrome/browser/profiles/profile_shortcut_manager_stub.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"
+
+// static
+bool ProfileShortcutManager::IsFeatureEnabled() {
+  return false;
+}
+
+// static
+ProfileShortcutManager* ProfileShortcutManager::Create() {
+  return NULL;
+}

chrome/browser/profiles/profile_shortcut_manager_unittest_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 "base/file_util.h"
+#include "base/message_loop.h"
+#include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_shortcut_manager.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/shell_util.h"
+#include "chrome/test/base/testing_pref_service.h"
+#include "content/public/test/test_browser_thread.h"
+#include "grit/theme_resources.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/resource_bundle.h"
+
+using content::BrowserThread;
+
+class ProfileShortcutManagerTest : public testing::Test {
+ protected:
+  ProfileShortcutManagerTest()
+      : file_thread_(BrowserThread::FILE, &message_loop_) {
+  }
+
+  virtual void SetUp() {
+    // Create a new temporary directory, and store the path
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+  }
+
+  virtual void TearDown() {
+    message_loop_.RunAllPending();
+  }
+
+  // The path to temporary directory used to contain the test operations.
+  ScopedTempDir temp_dir_;
+
+  MessageLoopForUI message_loop_;
+  content::TestBrowserThread file_thread_;
+};
+
+TEST_F(ProfileShortcutManagerTest, DesktopShortcutsIconExists) {
+  // Profile shortcut manager will be NULL for non-windows platforms
+  ProfileShortcutManager* profile_shortcut_manager =
+      ProfileShortcutManager::Create();
+
+  if (!profile_shortcut_manager)
+    return;
+
+  FilePath dest_path = temp_dir_.path();
+  string16 profile_name = ASCIIToUTF16("My Profile");
+
+  gfx::Image& avatar = ResourceBundle::GetSharedInstance().
+      GetNativeImageNamed(IDR_PROFILE_AVATAR_0);
+
+  profile_shortcut_manager->CreateChromeDesktopShortcut(dest_path,
+                                                        profile_name, avatar);
+
+  ASSERT_TRUE(file_util::PathExists(dest_path.Append(
+      (FILE_PATH_LITERAL("Google Profile.ico")))));
+
+  profile_shortcut_manager->DeleteChromeDesktopShortcut(dest_path);
+
+  // TODO(hallielaine): Verify shortcut deletion
+}
+
+TEST_F(ProfileShortcutManagerTest, DesktopShortcutsLnk) {
+  // Profile shortcut manager will be NULL for non-windows platforms
+  ProfileShortcutManager* profile_shortcut_manager =
+      ProfileShortcutManager::Create();
+
+  if (!profile_shortcut_manager)
+    return;
+
+  FilePath dest_path = temp_dir_.path();
+  dest_path = dest_path.Append(FILE_PATH_LITERAL("New Profile 1"));
+
+  gfx::Image& avatar = ResourceBundle::GetSharedInstance().
+      GetNativeImageNamed(IDR_PROFILE_AVATAR_0);
+
+  profile_shortcut_manager->CreateChromeDesktopShortcut(dest_path,
+      ASCIIToUTF16("My Profile"), avatar);
+
+  FilePath exe_path;
+  ASSERT_TRUE(PathService::Get(base::FILE_EXE, &exe_path));
+
+  FilePath shortcut;
+  string16 shortcut_name;
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+
+  // Get the desktop path of the current user
+  ShellUtil::GetDesktopPath(false, &shortcut);
+  // Get the name of the shortcut with profile attached
+  ShellUtil::GetChromeShortcutName(dist, false, ASCIIToUTF16("My Profile"),
+      &shortcut_name);
+  shortcut = shortcut.Append(shortcut_name);
+
+  EXPECT_EQ(ShellUtil::VERIFY_SHORTCUT_SUCCESS,
+      ShellUtil::VerifyChromeShortcut(exe_path.value(),
+          shortcut.value(), dist->GetAppDescription(), 0));
+
+  profile_shortcut_manager->DeleteChromeDesktopShortcut(dest_path);
+}

chrome/browser/profiles/profile_shortcut_manager_win.cc

@@ -2,10 +2,12 @@
 // 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 "chrome/browser/profiles/profile_shortcut_manager.h"
+
+#include <map>
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ -29,7 +31,6 @@
 #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;
 
@@ -40,22 +41,6 @@ const int kProfileAvatarShortcutBadgeWidth = 28;
 const int kProfileAvatarShortcutBadgeHeight = 28;
 const int kShortcutIconSize = 48;
 
-// Creates the argument to pass to the Windows executable that launches Chrome
-// with the profile in |profile_base_dir|.
-// For example: --profile-directory="Profile 2"
-string16 CreateProfileShortcutSwitch(const string16& profile_base_dir) {
-  return base::StringPrintf(L"--%ls=\"%ls\"",
-      ASCIIToUTF16(switches::kProfileDirectory).c_str(),
-      profile_base_dir.c_str());
-}
-
-// Wrap a ShellUtil function that returns a bool so it can be posted in a
-// task to the FILE thread.
-void CallShellUtilBoolFunction(
-    const base::Callback<bool(void)>& bool_function) {
-  bool_function.Run();
-}
-
 // Creates a desktop shortcut icon file (.ico) on the disk for a given profile,
 // badging the browser distribution icon with the profile avatar.
 // |profile_base_dir| is the base directory (and key) of the profile. Returns
@@ -73,7 +58,7 @@ FilePath CreateChromeDesktopShortcutIconForProfile(
   if (!app_icon_bitmap.get())
     return FilePath();
 
-  // TODO(stevet): Share this chunk of code with
+  // TODO(hallielaine): Share this chunk of code with
   // avatar_menu_button::DrawTaskBarDecoration.
   const SkBitmap* source_bitmap = NULL;
   SkBitmap squarer_bitmap;
@@ -117,106 +102,72 @@ FilePath CreateChromeDesktopShortcutIconForProfile(
   return icon_path;
 }
 
-// Creates a desktop shortcut to open Chrome with the given profile name and
-// base directory. Iff |create|, create shortcut if it doesn't already exist.
-// Must be called on the FILE thread.
-void CreateChromeDesktopShortcutForProfile(
-    const string16& profile_name,
-    const string16& profile_base_dir,
-    const FilePath& profile_path,
-    const gfx::Image* avatar_image,
-    bool create) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe))
-    return;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 description;
-  if (!dist)
-    return;
-  else
-    description = WideToUTF16(dist->GetAppDescription());
-  const string16& directory = CreateProfileShortcutSwitch(profile_base_dir);
-  FilePath icon_path = avatar_image ?
-      CreateChromeDesktopShortcutIconForProfile(profile_path, *avatar_image) :
-      FilePath();
-
-  ShellUtil::CreateChromeDesktopShortcut(
-      dist,
-      chrome_exe.value(),
-      description,
-      profile_name,
-      directory,
-      icon_path.empty() ? chrome_exe.value() : icon_path.value(),
-      icon_path.empty() ? dist->GetIconIndex() : 0,
-      ShellUtil::CURRENT_USER,
-      create ? ShellUtil::SHORTCUT_CREATE_ALWAYS :
-               ShellUtil::SHORTCUT_NO_OPTIONS);
+string16 CreateProfileShortcutFlags(const FilePath& profile_path) {
+    return base::StringPrintf(L"--%ls=\"%ls\"",
+      ASCIIToUTF16(switches::kProfileDirectory).c_str(),
+      profile_path.BaseName().value().c_str());
 }
 
-// Renames an existing Chrome desktop profile shortcut. Must be called on the
-// FILE thread.
-void RenameChromeDesktopShortcutForProfile(
-    const string16& old_shortcut,
-    const string16& new_shortcut) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  FilePath shortcut_path;
-  if (ShellUtil::GetDesktopPath(false,  // User's directory instead of system.
-                                &shortcut_path)) {
-    FilePath old_profile = shortcut_path.Append(old_shortcut);
-    FilePath new_profile = shortcut_path.Append(new_shortcut);
-    file_util::Move(old_profile, new_profile);
-  }
+// Wrap a ShellUtil function that returns a bool so it can be posted in a
+// task to the FILE thread.
+void CallShellUtilBoolFunction(
+    const base::Callback<bool(void)>& bool_function) {
+  bool_function.Run();
 }
 
-// Updates the arguments to a Chrome desktop shortcut for a profile. Must be
-// called on the FILE thread.
-void UpdateChromeDesktopShortcutForProfile(
-    const string16& shortcut,
-    const string16& arguments,
-    const FilePath& profile_path,
-    const gfx::Image* avatar_image) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  FilePath shortcut_path;
-  if (!ShellUtil::GetDesktopPath(false, &shortcut_path))
-    return;
+}  // namespace
 
-  shortcut_path = shortcut_path.Append(shortcut);
-  FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe))
-    return;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 description;
-  if (!dist)
-    return;
-  else
-    description = WideToUTF16(dist->GetAppDescription());
-  FilePath icon_path = avatar_image ?
-      CreateChromeDesktopShortcutIconForProfile(profile_path, *avatar_image) :
-      FilePath();
+class ProfileShortcutManagerWin : public ProfileShortcutManager {
+ public:
+  ProfileShortcutManagerWin();
+  virtual ~ProfileShortcutManagerWin();
+
+  virtual void CreateChromeDesktopShortcut(
+      const FilePath& profile_path, const string16& profile_name,
+      const gfx::Image& avatar_image) OVERRIDE;
+  virtual void DeleteChromeDesktopShortcut(const FilePath& profile_path)
+      OVERRIDE;
+
+ private:
+  struct ProfileShortcutInfo {
+    string16 flags;
+    string16 profile_name;
+    gfx::Image avatar_image;
+
+    ProfileShortcutInfo()
+        : flags(string16()),
+          profile_name(string16()),
+          avatar_image(gfx::Image()) {
+    }
 
-  ShellUtil::UpdateChromeShortcut(
-      dist,
-      chrome_exe.value(),
-      shortcut_path.value(),
-      arguments,
-      description,
-      icon_path.empty() ? chrome_exe.value() : icon_path.value(),
-      icon_path.empty() ? dist->GetIconIndex() : 0,
-      ShellUtil::SHORTCUT_NO_OPTIONS);
-}
+    ProfileShortcutInfo(
+        string16 p_flags,
+        string16 p_profile_name,
+        gfx::Image p_avatar_image)
+        : flags(p_flags),
+          profile_name(p_profile_name),
+          avatar_image(p_avatar_image) {
+    }
+  };
 
-void DeleteAutoLaunchValueForProfile(
-    const FilePath& profile_path) {
-  if (auto_launch_util::AutoStartRequested(profile_path.BaseName().value(),
-                                           true,  // Window requested.
-                                           FilePath())) {
-    auto_launch_util::DisableForegroundStartAtLogin(
-        profile_path.BaseName().value());
+  // TODO(hallielaine): Repopulate this map on chrome session startup
+  typedef std::map<FilePath, ProfileShortcutInfo> ProfileShortcutsMap;
+  ProfileShortcutsMap profile_shortcuts_;
+};
+
+// static
+bool ProfileShortcutManager::IsFeatureEnabled() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kProfileDesktopShortcuts)) {
+    return true;
   }
+  return false;
 }
 
-}  // namespace
+// static
+ProfileShortcutManager* ProfileShortcutManager::Create() {
+  return new ProfileShortcutManagerWin();
+}
 
 ProfileShortcutManagerWin::ProfileShortcutManagerWin() {
 }
@@ -224,208 +175,55 @@ ProfileShortcutManagerWin::ProfileShortcutManagerWin() {
 ProfileShortcutManagerWin::~ProfileShortcutManagerWin() {
 }
 
-void ProfileShortcutManagerWin::AddProfileShortcut(
-    const FilePath& profile_path) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
-  if (index == std::string::npos)
+void ProfileShortcutManagerWin::CreateChromeDesktopShortcut(
+    const FilePath& profile_path, const string16& profile_name,
+    const gfx::Image& avatar_image) {
+  FilePath shortcut_icon = CreateChromeDesktopShortcutIconForProfile(
+      profile_path, avatar_image);
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return;
-
-  // 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 =
-          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).
-    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 description;
+  if (!dist)
+    return;
+  description = WideToUTF16(dist->GetAppDescription());
 
-      string16 old_shortcut;
-      string16 new_shortcut;
-      if (ShellUtil::GetChromeShortcutName(dist, false, L"", &old_shortcut) &&
-          ShellUtil::GetChromeShortcutName(dist, false, first_name,
-                                           &new_shortcut)) {
-        // Update doesn't allow changing the target, so rename first.
-        BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-            base::Bind(&RenameChromeDesktopShortcutForProfile,
-                       old_shortcut, new_shortcut));
-
-        // Fetch the avatar for the first profile and make a copy of the Image
-        // to ensure that the underlying image data is AddRef'd, in case the
-        // original copy is deleted.
-        gfx::Image& first_avatar =
-            ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-                ProfileInfoCache::GetDefaultAvatarIconResourceIDAtIndex(
-                    cache.GetAvatarIconIndexOfProfileAtIndex(first_index)));
-        gfx::Image* first_avatar_copy = new gfx::Image(first_avatar);
-        FilePath first_path = cache.GetPathOfProfileAtIndex(first_index);
-
-        BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-            base::Bind(&UpdateChromeDesktopShortcutForProfile,
-                       new_shortcut,
-                       CreateProfileShortcutSwitch(UTF8ToUTF16(
-                           first_path.BaseName().MaybeAsASCII())),
-                       first_path,
-                       base::Owned(first_avatar_copy)));
-      }
+  // Add the profile to the map if it doesn't exist already
+  if (!profile_shortcuts_.count(profile_path)) {
+    string16 flags = CreateProfileShortcutFlags(profile_path);
+    profile_shortcuts_.insert(std::make_pair(profile_path,
+                              ProfileShortcutInfo(flags, profile_name,
+                                  avatar_image)));
   }
-  } else {  // Only one profile, so create original shortcut, with no avatar.
-    BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-        base::Bind(&CreateChromeDesktopShortcutForProfile,
-                   string16(), string16(), FilePath(),
-                   static_cast<gfx::Image*>(NULL), true));
-  }
-}
 
-void ProfileShortcutManagerWin::OnProfileAdded(
-    const FilePath& profile_path) {
+  ShellUtil::CreateChromeDesktopShortcut(
+      dist,
+      chrome_exe.value(),
+      description,
+      profile_shortcuts_[profile_path].profile_name,
+      profile_shortcuts_[profile_path].flags,
+      shortcut_icon.empty() ? chrome_exe.value() : shortcut_icon.value(),
+      shortcut_icon.empty() ? dist->GetIconIndex() : 0,
+      ShellUtil::CURRENT_USER,
+      ShellUtil::SHORTCUT_CREATE_ALWAYS);
 }
 
-void ProfileShortcutManagerWin::OnProfileWillBeRemoved(
+void ProfileShortcutManagerWin::DeleteChromeDesktopShortcut(
     const FilePath& profile_path) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
-  if (index == std::string::npos)
-    return;
-  string16 profile_name = cache.GetNameOfProfileAtIndex(index);
   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 we can find the shortcut, delete it
+  if (ShellUtil::GetChromeShortcutName(dist, false,
+      profile_shortcuts_[profile_path].profile_name, &shortcut)) {
+    std::vector<string16> appended_names(1, shortcut);
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
-      base::Bind(&DeleteAutoLaunchValueForProfile, profile_path));
-
-  // 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;
-
-  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(
-                       last_profile_path.BaseName().MaybeAsASCII())),
-                   last_profile_path,
-                   static_cast<gfx::Image*>(NULL)));
-  }
-}
-
-void ProfileShortcutManagerWin::OnProfileNameChanged(
-    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();
-  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
-  if (index == std::string::npos)
-    return;
-  string16 new_profile_name = cache.GetNameOfProfileAtIndex(index);
-
-  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 FilePath& profile_path) {
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index = cache.GetIndexOfProfileWithPath(profile_path);
-  if (index == std::string::npos)
-    return;
-  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 = 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)));
+            base::Bind(&CallShellUtilBoolFunction, base::Bind(
+                &ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames,
+                appended_names)));
+    profile_shortcuts_.erase(profile_path);
   }
 }
 
-// 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;
-}

chrome/chrome_browser.gypi

@@ -1989,8 +1989,10 @@
         'browser/profiles/profile_manager.h',
         'browser/profiles/profile_metrics.cc',
         'browser/profiles/profile_metrics.h',
+        'browser/profiles/profile_shortcut_manager.h',
+        'browser/profiles/profile_shortcut_manager.cc',
+        'browser/profiles/profile_shortcut_manager_stub.cc',
         'browser/profiles/profile_shortcut_manager_win.cc',
-        'browser/profiles/profile_shortcut_manager_win.h',
         'browser/profiles/refcounted_profile_keyed_service.h',
         'browser/profiles/refcounted_profile_keyed_service.cc',
         'browser/profiles/refcounted_profile_keyed_service_factory.h',
@@ -5259,6 +5261,7 @@
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/lifetime/application_lifetime_stub.cc',
+            'browser/profiles/profile_shortcut_manager_stub.cc',
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
             'browser/ui/crypto_module_password_dialog.cc',

chrome/chrome_tests.gypi

@@ -1505,6 +1505,7 @@
         'browser/profiles/profile_info_cache_unittest.h',
         'browser/profiles/profile_info_util_unittest.cc',
         'browser/profiles/profile_manager_unittest.cc',
+        'browser/profiles/profile_shortcut_manager_unittest_win.cc',
         'browser/protector/composite_settings_change_unittest.cc',
         'browser/protector/homepage_change_unittest.cc',
         'browser/protector/prefs_backup_invalid_change_unittest.cc',

chrome/common/chrome_switches.cc

@@ -1074,6 +1074,9 @@ const char kProductVersion[]                = "product-version";
 // Selects directory of profile to associate with the first browser launched.
 const char kProfileDirectory[]              = "profile-directory";
 
+// Enables the Windows profile desktop shortcuts feature.
+const char kProfileDesktopShortcuts[]     = "enable-profile-desktop-shortcuts";
+
 // Starts the sampling based profiler for the browser process at startup. This
 // will only work if chrome has been built with the gyp variable profiling=1.
 // The output will go to the value of kProfilingFile.

chrome/common/chrome_switches.h

@@ -288,6 +288,7 @@ extern const char kPrerenderModeSwitchValueEnabled[];
 extern const char kPrerenderModeSwitchValuePrefetchOnly[];
 extern const char kPrintSettingsReset[];
 extern const char kProductVersion[];
+extern const char kProfileDesktopShortcuts[];
 extern const char kProfileDirectory[];
 extern const char kProfilingAtStart[];
 extern const char kProfilingFile[];

chrome/test/base/testing_profile_manager.cc

@@ -24,13 +24,6 @@ class ProfileManager : public ::ProfileManager {
   virtual Profile* CreateProfileHelper(const FilePath& file_path) OVERRIDE {
     return new TestingProfile(file_path);
   }
-
-#if defined(OS_WIN)
-  virtual ProfileShortcutManagerWin* CreateShortcutManager() OVERRIDE {
-    // We should avoid creating shortcuts in these tests.
-    return NULL;
-  }
-#endif
 };
 
 }  // namespace testing