Implementing unified Chrome / App Launcher flow, and migrating old stand-alone App Launcher.

chrome/installer/util/chrome_app_host_distribution.cc

Index: chrome/installer/util/chrome_app_host_distribution.cc
diff --git a/chrome/installer/util/chrome_app_host_distribution.cc b/chrome/installer/util/chrome_app_host_distribution.cc
index 4ff30be22cf1e143fefdd357572043675ae11f98..e30bfa0072a318c94cf63dce665879a4eb662107 100644
--- a/chrome/installer/util/chrome_app_host_distribution.cc
+++ b/chrome/installer/util/chrome_app_host_distribution.cc
@@ -24,6 +24,12 @@ namespace {
 
 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
 
+#if defined(GOOGLE_CHROME_BUILD)
+  const int kAppLauncherIconIndex = 5;
+#else
+  const int kAppLauncherIconIndex = 1;
+#endif
+
 }  // namespace
 
 ChromeAppHostDistribution::ChromeAppHostDistribution()
@@ -35,19 +41,30 @@ string16 ChromeAppHostDistribution::GetAppGuid() {
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppName() {
-  return L"Google Chrome App Launcher";
+#if defined(GOOGLE_CHROME_BUILD)
+  return InstallUtil::IsChromeSxSProcess() ?
+      L"Google Chrome Canary App Launcher" : L"Google Chrome App Launcher";
+#else
+  return L"Chromium App Launcher";
+#endif
+}
+
+string16 ChromeAppHostDistribution::GetAppShortCutFolderName() {
+#if defined(GOOGLE_CHROME_BUILD)
+  return InstallUtil::IsChromeSxSProcess() ?
+    installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE) :
+    installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
+#else
+  return L"Chromium";
+#endif
 }
 
 string16 ChromeAppHostDistribution::GetAppShortCutName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
 }
 
 string16 ChromeAppHostDistribution::GetAlternateApplicationName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppId() {
@@ -111,8 +128,8 @@ string16 ChromeAppHostDistribution::GetUninstallLinkName() {
 }
 
 string16 ChromeAppHostDistribution::GetUninstallRegPath() {
-  return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
-         L"Google Chrome App Launcher";
+  NOTREACHED();
+  return string16();
 }
 
 string16 ChromeAppHostDistribution::GetVersionKey() {
@@ -131,7 +148,11 @@ bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {
 }
 
 string16 ChromeAppHostDistribution::GetIconFilename() {
-  return installer::kChromeAppHostExe;
+  return installer::kChromeExe;
+}
+
+int ChromeAppHostDistribution::GetIconIndex() {
+  return kAppLauncherIconIndex;
 }
 
 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(
@@ -148,3 +169,21 @@ void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
       kChromeAppHostGuid);
 #endif
 }
+
+LegacyChromeAppHostDistribution::LegacyChromeAppHostDistribution() {}
+
+string16 LegacyChromeAppHostDistribution::GetBaseAppName() {
+  return L"Google Chrome App Launcher";
+}
+
+string16 LegacyChromeAppHostDistribution::GetAppShortCutFolderName() {
+  return GetAppShortCutName();
+}
+
+string16 LegacyChromeAppHostDistribution::GetAppShortCutName() {
+  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
+}
+
+string16 LegacyChromeAppHostDistribution::GetAlternateApplicationName() {
+  return GetAppShortCutName();
+}