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..b180de958289cbf6dace481cff8446bec8228971 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -154,12 +154,44 @@ string16 BrowserDistribution::GetBaseAppName() {
   return L"Chromium";
 }
 
-string16 BrowserDistribution::GetAppShortCutName() {
-  return GetBaseAppName();
+string16 BrowserDistribution::GetDisplayName() {
+  return GetShortcutInfo(SHORTCUT_CHROME).name;
 }
 
-string16 BrowserDistribution::GetAlternateApplicationName() {
-  return L"The Internet";
+BrowserDistribution::ShortcutInfo BrowserDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      info.name = GetBaseAppName();
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_ALTERNATE_CHROME:
+      info.name = L"The Internet";
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.

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

I don't think we have localized Chromium strings in the installer.

[grt (UTC plus 2), 2013/05/29 13:50:09]

Although this wasn't always the case, I think it is now.

+      info.name = L"Chromium App Launcher";
+      info.icon_index = 1;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
+}
+
+string16 BrowserDistribution::GetStartMenuShortcutSubfolder(
+    SubfolderEnum subfolder_enum) {
+  switch (subfolder_enum) {
+    case SUBFOLDER_CHROME:
+      return GetShortcutInfo(SHORTCUT_CHROME).name;
+      break;
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
 string16 BrowserDistribution::GetBaseAppId() {
@@ -228,16 +260,6 @@ bool BrowserDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
-string16 BrowserDistribution::GetIconFilename() {
-  return string16();
-}
-
-int BrowserDistribution::GetIconIndex() {
-  // Assuming that main icon appears first alphabetically in the resource file
-  // for GetIconFilename().
-  return 0;
-}
-
 bool BrowserDistribution::GetChromeChannel(string16* channel) {
   return false;
 }
@@ -265,3 +287,4 @@ bool BrowserDistribution::ShouldSetExperimentLabels() {
 bool BrowserDistribution::HasUserExperiments() {
   return false;
 }
+

[grt (UTC plus 2), 2013/05/29 13:50:09]

is this an extra blank line? if so, please remove.

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

Done.