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

chrome/installer/util/chrome_app_host_distribution.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.
 //
 // This file defines a specific implementation of BrowserDistribution class for
 // Chrome App Host. It overrides the bare minimum of methods necessary to get a
 // Chrome App Host installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_app_host_distribution.h"
 
 #include "base/string_util.h"
 #include "chrome/common/net/test_server_locations.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 namespace {
 
 const wchar_t kChromeAppHostGuid[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}";
 
+#if defined(GOOGLE_CHROME_BUILD)
+  const int kAppLauncherIconIndex = 5;

[gab, 2013/05/15 22:42:20]

Coordinate with https://codereview.chromium.org/13864015/

[huangs, 2013/05/17 20:59:24]

Will do so once I merge.  Keeping this now for testing.

+#else
+  const int kAppLauncherIconIndex = 1;
+#endif
+
 }  // namespace
 
 ChromeAppHostDistribution::ChromeAppHostDistribution()
     : BrowserDistribution(CHROME_APP_HOST) {
 }
 
 string16 ChromeAppHostDistribution::GetAppGuid() {
   return kChromeAppHostGuid;
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppName() {
-  return L"Google Chrome App Launcher";
+#if defined(GOOGLE_CHROME_BUILD)

[grt (UTC plus 2), 2013/05/16 14:55:52]

I think it's safe to replace the body of this function with:
  NOTREACHED();
  return string();
since this function only applies for distros that can be made the default. If
you want to be paranoid, then make it:
  NOTREACHED();
  L"Google Chrome App Launcher";

[huangs, 2013/05/17 20:59:24]

https://codereview.chromium.org/13864015/ will refactor a whole lot of these. 
Until I merge with the cleaned up code, I'm going to keep this for testing.

+  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)

[grt (UTC plus 2), 2013/05/16 14:55:52]

Can this whole function become:
  GetSpecificDistribution(CHROME_BROWSER)->GetAppShortCutFolderName();

[huangs, 2013/05/17 20:59:24]

Discussed with gab@, the plan for (https://codereview.chromium.org/13864015/) is
to have 2 routines, for Chrome / Chromium / Canary:

1. Given enum ({Chrome, App Launcher}), return struct containing shortcut name,
shortcut icon exe, shortcut icon index.
2. Given enum ({Chrome folder, App list folder}), return directory suffix for
Start Menu shortcuts.

However, leaving this the way it is for testing; will wipe out once we merge.

+  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() {
   // Should be same as AppListController::GetAppModelId().
   return L"ChromeAppList";
 }
 
 string16 ChromeAppHostDistribution::GetInstallSubDir() {
   return BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BINARIES)->GetInstallSubDir();
@@ skipping 43 matching lines @@
   return chrome_common_net::kPipelineTestServerBaseUrl;
 }
 
 string16 ChromeAppHostDistribution::GetUninstallLinkName() {
   const string16& link_name =
       installer::GetLocalizedString(IDS_UNINSTALL_APP_LAUNCHER_BASE);
   return link_name;
 }
 
 string16 ChromeAppHostDistribution::GetUninstallRegPath() {
-  return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
-         L"Google Chrome App Launcher";
+  NOTREACHED();
+  return string16();
 }
 
 string16 ChromeAppHostDistribution::GetVersionKey() {
   string16 key(google_update::kRegPathClients);
   key.append(L"\\");
   key.append(kChromeAppHostGuid);
   return key;
 }
 
 bool ChromeAppHostDistribution::CanSetAsDefault() {
   return false;
 }
 
 bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
 string16 ChromeAppHostDistribution::GetIconFilename() {
-  return installer::kChromeAppHostExe;
+  return installer::kChromeExe;
+}
+
+int ChromeAppHostDistribution::GetIconIndex() {
+  return kAppLauncherIconIndex;
 }
 
 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;
 }
 
 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 #if defined(GOOGLE_CHROME_BUILD)
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       kChromeAppHostGuid);
 #endif
 }
+
+LegacyChromeAppHostDistribution::LegacyChromeAppHostDistribution() {}
+
+string16 LegacyChromeAppHostDistribution::GetBaseAppName() {
+  return L"Google Chrome App Launcher";

[grt (UTC plus 2), 2013/05/16 14:55:52]

see comment above

[huangs, 2013/05/17 20:59:24]

Same as above. This will be deleted. If we decided to delete the Start
Menu\Google Chrome App Launcher shortcut, this will has to be done in an ad-hoc
fashion.

+}
+
+string16 LegacyChromeAppHostDistribution::GetAppShortCutFolderName() {
+  return GetAppShortCutName();
+}
+
+string16 LegacyChromeAppHostDistribution::GetAppShortCutName() {
+  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
+}
+
+string16 LegacyChromeAppHostDistribution::GetAlternateApplicationName() {
+  return GetAppShortCutName();
+}