Refactor of BrowserDistribution.

chrome/installer/util/browser_distribution.cc

Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 4f711419db140c7338e7eeaeef6331f99c93f301..429346465db27ff745144ad18c8ac6d7af89d23e 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -154,12 +154,34 @@ string16 BrowserDistribution::GetBaseAppName() {
   return L"Chromium";
 }
 
-string16 BrowserDistribution::GetAppShortCutName() {
-  return GetBaseAppName();
+string16 BrowserDistribution::GetDisplayName() {
+  return GetShortcutName(SHORTCUT_CHROME);
+}
+
+string16 BrowserDistribution::GetShortcutName(ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      return GetBaseAppName();
+    case SHORTCUT_ALTERNATE_CHROME:
+      return L"The Internet";
+    case SHORTCUT_APP_LAUNCHER:
+      return L"Chromium App Launcher";
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
-string16 BrowserDistribution::GetAlternateApplicationName() {
-  return L"The Internet";
+string16 BrowserDistribution::GetStartMenuShortcutSubfolder(
+    SubfolderEnum subfolder_enum) {
+  switch (subfolder_enum) {
+    case SUBFOLDER_CHROME:
+      return GetShortcutName(SHORTCUT_CHROME);
+      break;

[gab, 2013/06/18 19:50:29]

Remove break; since you return on the previous line.

[calamity, 2013/06/27 01:27:44]

Done.

+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
 string16 BrowserDistribution::GetBaseAppId() {
@@ -232,10 +254,19 @@ string16 BrowserDistribution::GetIconFilename() {
   return string16();
 }
 
-int BrowserDistribution::GetIconIndex() {
-  // Assuming that main icon appears first alphabetically in the resource file
-  // for GetIconFilename().
-  return 0;
+int BrowserDistribution::GetIconIndex(ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      // Assuming that main icon appears first alphabetically in the resource
+      // file for GetIconFilename().
+      return 0;
+    case SHORTCUT_APP_LAUNCHER:
+      return 1;
+    default:
+      NOTREACHED();
+      return 0;
+  }
 }
 
 bool BrowserDistribution::GetChromeChannel(string16* channel) {