Refactor of BrowserDistribution.

chrome/installer/util/chrome_frame_distribution.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines a specific implementation of BrowserDistribution class for
 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
 // Chrome Frame installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_frame_distribution.h"
@@ skipping 18 matching lines @@
 }
 
 string16 ChromeFrameDistribution::GetAppGuid() {
   return kChromeFrameGuid;
 }
 
 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() {
   return L"Google\\Chrome Frame";
 }
 
 string16 ChromeFrameDistribution::GetPublisherName() {
   const string16& publisher_name =
       installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
@@ skipping 42 matching lines @@
          L"Google Chrome Frame";
 }
 
 string16 ChromeFrameDistribution::GetVersionKey() {
   string16 key(google_update::kRegPathClients);
   key.append(L"\\");
   key.append(kChromeFrameGuid);
   return key;
 }
 
-string16 ChromeFrameDistribution::GetIconFilename() {
-  return installer::kChromeExe;
-}
-
-int ChromeFrameDistribution::GetIconIndex() {
-  return 0;
-}
-
 bool ChromeFrameDistribution::CanSetAsDefault() {
   return false;
 }
 
 bool ChromeFrameDistribution::CanCreateDesktopShortcuts() {
   return false;
 }
 
 bool ChromeFrameDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;
 }
 
 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 #if defined(GOOGLE_CHROME_BUILD)
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       kChromeFrameGuid);
 #endif
 }