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..edcb3ea3fb98893c2c4162e1951556803e1fd770 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -154,6 +154,10 @@ string16 BrowserDistribution::GetBaseAppName() {
   return L"Chromium";
 }
 
+string16 BrowserDistribution::GetDisplayName() {
+  return GetShortcutInfo(SHORTCUT_CHROME).name;
+}
+
 string16 BrowserDistribution::GetAppShortCutName() {
   return GetBaseAppName();
 }
@@ -162,6 +166,38 @@ string16 BrowserDistribution::GetAlternateApplicationName() {
   return L"The Internet";
 }
 
+BrowserDistribution::ShortcutInfo BrowserDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      info.name = GetAppShortCutName();
+      info.icon_index = GetIconIndex();
+      info.icon_file = GetIconFilename();
+      break;
+    case SHORTCUT_ALTERNATE_CHROME:
+      info.name = GetAlternateApplicationName();
+      info.icon_index = GetIconIndex();
+      info.icon_file = GetIconFilename();
+      break;
+    default:
+      NOTREACHED();
+  }
+  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() {
   return L"Chromium";
 }
@@ -265,3 +301,7 @@ bool BrowserDistribution::ShouldSetExperimentLabels() {
 bool BrowserDistribution::HasUserExperiments() {
   return false;
 }
+
+int BrowserDistribution::GetAppListIconIndex() {
+  return 1;
+}