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..da796150d4f98915c547cd5b2723d3a562e0c289 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(ShortcutType shortcut_type) {
+  switch (shortcut_type) {

[grt (UTC plus 2), 2013/07/05 17:27:37]

  int string_id = IDS_PRODUCT_NAME_BASE;
  switch (shortcut_type) {
    case SHORTCUT_ALTERNATE_CHROME:
      string_id = IDS_OEM_MAIN_SHORTCUT_NAME_BASE;
      break;
    case SHORTCUT_APP_LAUNCHER:
      string_id = IDS_APP_LIST_SHORTCUT_NAME_BASE;
      break;
    default:
      DCHECK_EQ(shortcut_type, SHORTCUT_CHROME);
      break;
  }
  return installer::GetLocalizedString(string_id);

[calamity, 2013/07/16 04:05:17]

Done.

+    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(ShortcutType shortcut_type) {
+  switch (shortcut_type) {

[grt (UTC plus 2), 2013/07/05 17:27:37]

  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
    return kAppLauncherIconIndex;  (5, defined in the unnamed namespace)
  DCHECK(shortcut_type == SHORTCUT_CHROME ||
         shortcut_type == SHORTCUT_ALTERNATE_CHROME) << shortcut_type;
  return 0;

[calamity, 2013/07/16 04:05:17]

Done.

+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      return 0;
+    case SHORTCUT_APP_LAUNCHER:
+      return 6;

[grt (UTC plus 2), 2013/07/05 17:27:37]

Looks like this should be 5 according to chrome_exe.rc. Also, please make it a
file-local constant in the unnamed namespace (e.g., kAppLauncherIconIndex) and
put a comment next to it along the lines of
// The Google Chrome App Launcher icon is index 5; see chrome_exe.rc.

[calamity, 2013/07/16 04:05:17]

Done.

+    default:
+      NOTREACHED();
+      return 0;
+  }
 }
 
 string16 GoogleChromeDistribution::GetBaseAppId() {