Refactor of BrowserDistribution.

chrome/installer/util/chromium_binaries_distribution.cc

Index: chrome/installer/util/chromium_binaries_distribution.cc
diff --git a/chrome/installer/util/chromium_binaries_distribution.cc b/chrome/installer/util/chromium_binaries_distribution.cc
index 514dfa7dcc284c7ca32ad6de57d52554fb445aae..bcf5c7953dd8ae1667ddffa7fecc335cbbf03f4d 100644
--- a/chrome/installer/util/chromium_binaries_distribution.cc
+++ b/chrome/installer/util/chromium_binaries_distribution.cc
@@ -29,13 +29,19 @@ string16 ChromiumBinariesDistribution::GetBaseAppName() {
   return string16();
 }
 
-string16 ChromiumBinariesDistribution::GetAppShortCutName() {
-  return kChromiumBinariesName;
-}
-
-string16 ChromiumBinariesDistribution::GetAlternateApplicationName() {
-  NOTREACHED();
-  return string16();
+BrowserDistribution::ShortcutInfo ChromiumBinariesDistribution::GetShortcutInfo(

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

The binaries shouldn't need GetShortcutInfo; if this is only required for
GetDisplayName(), I say make GetShortcutInfo NOTREACHED() as the other methods
and override GetDisplayName() to return kChromiumBinariesName.

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

Done.

+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      info.name = kChromiumBinariesName;
+      info.icon_index = 0;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
 }
 
 string16 ChromiumBinariesDistribution::GetBaseAppId() {
@@ -93,11 +99,6 @@ bool ChromiumBinariesDistribution::CanSetAsDefault() {
   return false;
 }
 
-int ChromiumBinariesDistribution::GetIconIndex() {
-  NOTREACHED();
-  return 0;
-}
-
 bool ChromiumBinariesDistribution::GetChromeChannel(string16* channel) {
   NOTREACHED();
   return false;