Add Windows desktop shortcut for multiple profiles.

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 527 matching lines @@
   for (std::list<RegistryEntry*>::const_iterator itr = entries.begin();
        itr != entries.end() && !cleanup_needed; ++itr) {
     cleanup_needed = (*itr)->NameExistsInHKLM();
   }
   return cleanup_needed;
 }
 
 bool ShellUtil::CreateChromeDesktopShortcut(BrowserDistribution* dist,
                                             const std::wstring& chrome_exe,
                                             const std::wstring& description,
+                                            const std::wstring& appended_name,
+                                            const std::wstring& arguments,
                                             ShellChange shell_change,
                                             bool alternate,
                                             bool create_new) {
   std::wstring shortcut_name;
-  if (!ShellUtil::GetChromeShortcutName(dist, &shortcut_name, alternate))
+  if (!ShellUtil::GetChromeShortcutName(dist, alternate, appended_name,
+                                        &shortcut_name))
     return false;
 
   bool ret = false;
   if (shell_change == ShellUtil::CURRENT_USER) {
     FilePath shortcut_path;
     // We do not want to create a desktop shortcut to Chrome in the current
     // user's desktop folder if there is already one in the "All Users"
     // desktop folder.
     bool got_system_desktop = ShellUtil::GetDesktopPath(true, &shortcut_path);
     FilePath shortcut = shortcut_path.Append(shortcut_name);
     if (!got_system_desktop || !file_util::PathExists(shortcut)) {
       // Either we couldn't query the "All Users" Desktop folder or there's
       // nothing in it, so let's continue.
       if (ShellUtil::GetDesktopPath(false, &shortcut_path)) {
         shortcut = shortcut_path.Append(shortcut_name);
-        ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe,
+        ret = ShellUtil::UpdateChromeShortcut(dist,
+                                              chrome_exe,
                                               shortcut.value(),
-                                              description, create_new);
+                                              arguments,
+                                              description,
+                                              create_new);
       }
     }
   } else if (shell_change == ShellUtil::SYSTEM_LEVEL) {
     FilePath shortcut_path;
     if (ShellUtil::GetDesktopPath(true, &shortcut_path)) {
       FilePath shortcut = shortcut_path.Append(shortcut_name);
-      ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe,
+      ret = ShellUtil::UpdateChromeShortcut(dist,
+                                            chrome_exe,
                                             shortcut.value(),
-                                            description, create_new);
+                                            arguments,
+                                            description,
+                                            create_new);
     }
   } else {
     NOTREACHED();
   }
   return ret;
 }
 
 bool ShellUtil::CreateChromeQuickLaunchShortcut(BrowserDistribution* dist,
                                                 const std::wstring& chrome_exe,
                                                 int shell_change,
                                                 bool create_new) {
   std::wstring shortcut_name;
-  if (!ShellUtil::GetChromeShortcutName(dist, &shortcut_name, false))
+  if (!ShellUtil::GetChromeShortcutName(dist, false, L"", &shortcut_name))
     return false;
 
   bool ret = true;
   // First create shortcut for the current user.
   if (shell_change & ShellUtil::CURRENT_USER) {
     std::wstring user_ql_path;
     if (ShellUtil::GetQuickLaunchPath(false, &user_ql_path)) {
       file_util::AppendToPath(&user_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe, user_ql_path,
-                                            L"", create_new);
+                                            L"", L"", create_new);
     } else {
       ret = false;
     }
   }
 
   // Add a shortcut to Default User's profile so that all new user profiles
   // get it.
   if (shell_change & ShellUtil::SYSTEM_LEVEL) {
     std::wstring default_ql_path;
     if (ShellUtil::GetQuickLaunchPath(true, &default_ql_path)) {
       file_util::AppendToPath(&default_ql_path, shortcut_name);
       ret = ShellUtil::UpdateChromeShortcut(dist, chrome_exe, default_ql_path,
-                                            L"", create_new) && ret;
+                                            L"", L"", create_new) && ret;
     } else {
       ret = false;
     }
   }
 
   return ret;
 }
 
 std::wstring ShellUtil::GetChromeIcon(BrowserDistribution* dist,
                                       const std::wstring& chrome_exe) {
   std::wstring chrome_icon(chrome_exe);
   chrome_icon.append(L",");
   chrome_icon.append(base::IntToString16(dist->GetIconIndex()));
   return chrome_icon;
 }
 
 std::wstring ShellUtil::GetChromeShellOpenCmd(const std::wstring& chrome_exe) {
   return L"\"" + chrome_exe + L"\" -- \"%1\"";
 }
 
 bool ShellUtil::GetChromeShortcutName(BrowserDistribution* dist,
-                                      std::wstring* shortcut, bool alternate) {
+                                      bool alternate,
+                                      const std::wstring& appended_name,
+                                      std::wstring* shortcut) {
   shortcut->assign(alternate ? dist->GetAlternateApplicationName() :
                                dist->GetAppShortCutName());
+  if (appended_name.length() > 0) {
+    shortcut->append(L" (");
+    shortcut->append(appended_name);
+    shortcut->append(L")");
+  }
   shortcut->append(L".lnk");
   return true;
 }
 
 bool ShellUtil::GetDesktopPath(bool system_level, FilePath* path) {
   wchar_t desktop[MAX_PATH];
   int dir = system_level ? CSIDL_COMMON_DESKTOPDIRECTORY :
                            CSIDL_DESKTOPDIRECTORY;
   if (FAILED(SHGetFolderPath(NULL, dir, NULL, SHGFP_TYPE_CURRENT, desktop)))
     return false;
@@ skipping 297 matching lines @@
   } else {
     // we need admin rights to register our capability. If we don't
     // have them and can't elevate, give up.
     return false;
   }
 }
 
 bool ShellUtil::RemoveChromeDesktopShortcut(BrowserDistribution* dist,
                                             int shell_change, bool alternate) {
   std::wstring shortcut_name;
-  if (!ShellUtil::GetChromeShortcutName(dist, &shortcut_name, alternate))
+  if (!ShellUtil::GetChromeShortcutName(dist, alternate, L"",
+                                        &shortcut_name))
     return false;
 
   bool ret = true;
   if (shell_change & ShellUtil::CURRENT_USER) {
     FilePath shortcut_path;
     if (ShellUtil::GetDesktopPath(false, &shortcut_path)) {
       FilePath shortcut = shortcut_path.Append(shortcut_name);
       ret = file_util::Delete(shortcut, false);
     } else {
       ret = false;
     }
   }
 
   if (shell_change & ShellUtil::SYSTEM_LEVEL) {
     FilePath shortcut_path;
     if (ShellUtil::GetDesktopPath(true, &shortcut_path)) {
       FilePath shortcut = shortcut_path.Append(shortcut_name);
       ret = file_util::Delete(shortcut, false) && ret;
     } else {
       ret = false;
     }
   }
   return ret;
 }
 
+bool ShellUtil::RemoveChromeDesktopShortcutsWithAppendedNames(
+    std::vector<std::wstring> appended_names) {
+  FilePath shortcut_path;
+  bool ret = true;
+  if (ShellUtil::GetDesktopPath(false, &shortcut_path)) {
+    for (std::vector<std::wstring>::iterator it = appended_names.begin();
+         it != appended_names.end();
+         it++) {
+      FilePath delete_shortcut = shortcut_path.Append(*it);
+      ret = ret && file_util::Delete(delete_shortcut, false);
+    }
+  } else {
+    ret = false;
+  }
+  return ret;
+}
+
 bool ShellUtil::RemoveChromeQuickLaunchShortcut(BrowserDistribution* dist,
                                                 int shell_change) {
   std::wstring shortcut_name;
-  if (!ShellUtil::GetChromeShortcutName(dist, &shortcut_name, false))
+  if (!ShellUtil::GetChromeShortcutName(dist, false, L"", &shortcut_name))
     return false;
 
   bool ret = true;
   // First remove shortcut for the current user.
   if (shell_change & ShellUtil::CURRENT_USER) {
     std::wstring user_ql_path;
     if (ShellUtil::GetQuickLaunchPath(false, &user_ql_path)) {
       file_util::AppendToPath(&user_ql_path, shortcut_name);
       ret = file_util::Delete(user_ql_path, false);
     } else {
@@ skipping 11 matching lines @@
       ret = false;
     }
   }
 
   return ret;
 }
 
 bool ShellUtil::UpdateChromeShortcut(BrowserDistribution* dist,
                                      const std::wstring& chrome_exe,
                                      const std::wstring& shortcut,
+                                     const std::wstring& arguments,
                                      const std::wstring& description,
                                      bool create_new) {
   std::wstring chrome_path = FilePath(chrome_exe).DirName().value();
 
   FilePath prefs_path(chrome_path);
   prefs_path = prefs_path.AppendASCII(installer::kDefaultMasterPrefs);
   installer::MasterPreferences prefs(prefs_path);
   int icon_index = dist->GetIconIndex();
   prefs.GetInt(installer::master_preferences::kChromeShortcutIconIndex,
                &icon_index);
   if (create_new) {
     return file_util::CreateShortcutLink(
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
-        NULL,                              // arguments
+        arguments.c_str(),                 // arguments
         description.c_str(),               // description
         chrome_exe.c_str(),                // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   } else {
     return file_util::UpdateShortcutLink(
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
-        NULL,                              // arguments
+        arguments.c_str(),                 // arguments
         description.c_str(),               // description
         chrome_exe.c_str(),                // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   }
 }