Use different short cut names for SxS installation.

This change includes: desktop shortcut, quick launch short cut,
short cut name in start menu, add/remove program name.

BUG=35574
TEST=Run "setup --chrome-sxs" and Chrome is installed with different short cut.

Review URL: http://codereview.chromium.org/661051

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

2 files changed, 3 insertions, 3 deletions

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index d3533d4..1c8c903 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -219,7 +219,7 @@ bool CreateOrUpdateChromeShortcuts(const std::wstring& exe_path,
 
   // The location of Start->Programs->Google Chrome folder
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  const std::wstring& product_name = dist->GetApplicationName();
+  const std::wstring& product_name = dist->GetAppShortCutName();
   const std::wstring& product_desc = dist->GetAppDescription();
   shortcut_path = shortcut_path.Append(product_name);
 
@@ -551,7 +551,7 @@ installer_util::InstallStatus InstallNewVersion(
   AddInstallerCopyTasks(exe_path, archive_path, temp_dir, install_path,
                         new_version.GetString(), install_list.get(),
                         (reg_root == HKEY_LOCAL_MACHINE));
-  std::wstring product_name = dist->GetApplicationName();
+  std::wstring product_name = dist->GetAppShortCutName();
   AddUninstallShortcutWorkItems(reg_root, exe_path, install_path,
       product_name, new_version.GetString(), install_list.get());
 
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index b943e87..049acc6 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -110,7 +110,7 @@ void DeleteChromeShortcuts(bool system_uninstall) {
     LOG(ERROR) << "Failed to get location for shortcut.";
   } else {
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    shortcut_path = shortcut_path.Append(dist->GetApplicationName());
+    shortcut_path = shortcut_path.Append(dist->GetAppShortCutName());
     LOG(INFO) << "Deleting shortcut " << shortcut_path.value();
     if (!file_util::Delete(shortcut_path, true))
       LOG(ERROR) << "Failed to delete folder: " << shortcut_path.value();