Refactor of BrowserDistribution.

chrome/installer/util/google_chrome_distribution.cc

Index: chrome/installer/util/google_chrome_distribution.cc
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index c7a7c3e410077a350e5cb2cf3fc1a02c298e49d9..56e3b2a4b460ff8f8e9a2b40174503cbc11900a6 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -125,16 +125,32 @@ string16 GoogleChromeDistribution::GetBaseAppName() {
   return L"Google Chrome";
 }
 
-string16 GoogleChromeDistribution::GetAppShortCutName() {
-  const string16& app_shortcut_name =
-      installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
-  return app_shortcut_name;
+string16 GoogleChromeDistribution::GetShortcutName(ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      return installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
+    case SHORTCUT_ALTERNATE_CHROME:
+      return installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.
+      return L"Chrome App Launcher";
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
-string16 GoogleChromeDistribution::GetAlternateApplicationName() {
-  const string16& alt_product_name =
-      installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
-  return alt_product_name;
+int GoogleChromeDistribution::GetIconIndex(ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      return 0;
+    case SHORTCUT_APP_LAUNCHER:
+      return 6;
+    default:
+      NOTREACHED();
+      return 0;
+  }
 }
 
 string16 GoogleChromeDistribution::GetBaseAppId() {