Refactor of BrowserDistribution.

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..99781b09c29438c65b5b738b9ec1f809da4ef4a6 100644
--- a/chrome/installer/util/chrome_app_host_distribution.cc
+++ b/chrome/installer/util/chrome_app_host_distribution.cc
@@ -38,16 +38,27 @@ string16 ChromeAppHostDistribution::GetBaseAppName() {
   return L"Google Chrome App Launcher";
 }
 
-string16 ChromeAppHostDistribution::GetAppShortCutName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
-}
-
-string16 ChromeAppHostDistribution::GetAlternateApplicationName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+BrowserDistribution::ShortcutInfo ChromeAppHostDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  info.icon_file = installer::kChromeAppHostExe;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:

[gab, 2013/05/24 15:01:35]

I don't think SHORTCUT_CHROME/SHORTCUT_ALTERNATE_CHROME should be used for this
distribution, move them to the NOTREACHED() section at the end with a comment.

(in fact this distribution can probably be removed soon now that App Launcher is
being made a part of Chrome and that this refactoring makes
Chrome/Chromium/Canary distributions aware of the App Launcher constants)

[calamity, 2013/05/31 00:11:18]

Done.

+      info.name = installer::GetLocalizedString(
+          IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.
+      info.name = L"Chromium App Launcher";

[gab, 2013/05/24 15:01:35]

Shouldn't this simply become
installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE) as line 48
used to be (it was wrong for that to be in GetAlternateApplicationName() imo,
but wtv...).

[calamity, 2013/05/31 00:11:18]

Done.

+      info.icon_index = 1;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppId() {
@@ -130,10 +141,6 @@ bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
-string16 ChromeAppHostDistribution::GetIconFilename() {
-  return installer::kChromeAppHostExe;
-}
-
 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;