Fix issue 32106

chrome/browser/user_data_manager.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include "chrome/browser/user_data_manager.h"
 
 #include <string>
 
@@ skipping 246 matching lines @@
       false, file_util::FileEnumerator::DIRECTORIES);
   std::wstring folder_name;
   while (!(folder_name = file_enum.Next().ToWStringHack()).empty()) {
     folder_name = file_util::GetFilenameFromPath(folder_name);
     std::wstring profile_name;
     if (GetProfileNameFromFolderName(folder_name, &profile_name))
       profiles->push_back(profile_name);
   }
 }
 
-bool UserDataManager::CreateDesktopShortcutForProfile(
+bool UserDataManager::CreateShortcutForProfileInFolder(
+    const FilePath& folder,
     const std::wstring& profile_name) const {
 #if defined(OS_WIN)
   std::wstring exe_path;
-  std::wstring shortcut_path;
-  if (!PathService::Get(base::FILE_EXE, &exe_path) ||
-      !ShellUtil::GetDesktopPath(false, &shortcut_path))
+  if (!PathService::Get(base::FILE_EXE, &exe_path))
     return false;
 
   // Working directory.
   std::wstring exe_folder = file_util::GetDirectoryFromPath(exe_path);
 
   // Command and arguments.
   std::wstring cmd;
   cmd = StringPrintf(L"\"%ls\"", exe_path.c_str());
   std::wstring user_data_dir = GetUserDataFolderForProfile(profile_name);
   std::wstring args = CommandLine::PrefixedSwitchStringWithValue(
       switches::kUserDataDir,
       user_data_dir);
   args = StringPrintf(L"\"%ls\"", args.c_str());
 
   // Shortcut path.
   std::wstring shortcut_name = l10n_util::GetStringF(
       IDS_START_IN_PROFILE_SHORTCUT_NAME,
       profile_name);
   shortcut_name.append(L".lnk");
-  file_util::AppendToPath(&shortcut_path, shortcut_name);
+
+  std::wstring shortcut_path = folder.Append(shortcut_name).ToWStringHack();
 
   // Profile path from user_data_dir.
   FilePath profile_path = FilePath(user_data_dir).Append(
       chrome::kNotSignedInProfile);
 
   return file_util::CreateShortcutLink(
       cmd.c_str(),
       shortcut_path.c_str(),
       exe_folder.c_str(),
       args.c_str(),
       NULL,
       exe_path.c_str(),
       0,
       ShellIntegration::GetChromiumAppId(profile_path).c_str());
 #else
+  NOTIMPLEMENTED();
+  return false;
+#endif
+}
+
+bool UserDataManager::CreateDesktopShortcutForProfile(
+    const std::wstring& profile_name) const {
+#if defined(OS_WIN)
+  std::wstring desktop_path;
+  if (!ShellUtil::GetDesktopPath(false, &desktop_path))
+    return false;
+
+  return CreateShortcutForProfileInFolder(FilePath(desktop_path), profile_name);
+#else
   // TODO(port): should probably use freedesktop.org standard for desktop files.
   NOTIMPLEMENTED();
   return false;
 #endif
 }
 
 void UserDataManager::RefreshUserDataDirProfiles() const {
   // UserDataDirProfilesUpdater will delete itself when done.
   UserDataDirProfilesUpdater* updater = new UserDataDirProfilesUpdater();
   updater->Run();
@@ skipping 43 matching lines @@
                         &GetProfilesHelper::InvokeDelegate,
                         profiles.release()));
 }
 
 void GetProfilesHelper::InvokeDelegate(std::vector<std::wstring>* profiles) {
   scoped_ptr< std::vector<std::wstring> > udd_profiles(profiles);
   // If the delegate is gone by now, no need to do any work.
   if (delegate_)
     delegate_->OnGetProfilesDone(*udd_profiles.get());
 }