Refactor of BrowserDistribution.

chrome/installer/util/chrome_frame_distribution.cc

Index: chrome/installer/util/chrome_frame_distribution.cc
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index 1db044641319f7756943b395b843346f9ecf37f1..a353429f077e979629d73bf43a1f970f62f8d45a 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -36,16 +36,21 @@ string16 ChromeFrameDistribution::GetBaseAppName() {
   return L"Google Chrome Frame";
 }
 
-string16 ChromeFrameDistribution::GetAppShortCutName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
-  return product_name;
-}
-
-string16 ChromeFrameDistribution::GetAlternateApplicationName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
-  return product_name;
+BrowserDistribution::ShortcutInfo ChromeFrameDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  info.icon_file = installer::kChromeExe;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:

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

SHORTCUT_ALTERNATE_CHROME shouldn't be needed by CF, add to NOTREACHED() section
below with a comment.

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

Done.

+      info.name = installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
+      info.icon_index = 0;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
 }
 
 string16 ChromeFrameDistribution::GetInstallSubDir() {
@@ -108,14 +113,6 @@ string16 ChromeFrameDistribution::GetVersionKey() {
   return key;
 }
 
-string16 ChromeFrameDistribution::GetIconFilename() {
-  return installer::kChromeExe;
-}
-
-int ChromeFrameDistribution::GetIconIndex() {
-  return 0;
-}
-
 bool ChromeFrameDistribution::CanSetAsDefault() {
   return false;
 }