Refactor of BrowserDistribution.

chrome/installer/util/google_chrome_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 specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 107 matching lines @@
   return product_guid();
 }
 
 string16 GoogleChromeDistribution::GetBaseAppName() {
   // I'd really like to return L ## PRODUCT_FULLNAME_STRING; but that's no good
   // since it'd be "Chromium" in a non-Chrome build, which isn't at all what I
   // want.  Sigh.
   return L"Google Chrome";
 }
 
-string16 GoogleChromeDistribution::GetAppShortCutName() {
-  const string16& app_shortcut_name =
-      installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
-  return app_shortcut_name;
-}
-
-string16 GoogleChromeDistribution::GetAlternateApplicationName() {
-  const string16& alt_product_name =
-      installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
-  return alt_product_name;
+BrowserDistribution::ShortcutInfo GoogleChromeDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  info.icon_file = installer::kChromeExe;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      info.name = installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.
+      info.name = L"Chrome App Launcher Canary";

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

This should be Google Chrome, not Canary.

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

Done.

+      info.icon_index = 6;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
 }
 
 string16 GoogleChromeDistribution::GetBaseAppId() {
   return kBrowserAppId;
 }
 
 string16 GoogleChromeDistribution::GetInstallSubDir() {
   string16 sub_dir(installer::kGoogleChromeInstallSubDir1);
   sub_dir.append(L"\\");
   sub_dir.append(installer::kGoogleChromeInstallSubDir2);
@@ skipping 85 matching lines @@
          L"Google Chrome";
 }
 
 string16 GoogleChromeDistribution::GetVersionKey() {
   string16 key(google_update::kRegPathClients);
   key.append(L"\\");
   key.append(product_guid());
   return key;
 }
 
-string16 GoogleChromeDistribution::GetIconFilename() {
-  return installer::kChromeExe;
-}
-
 bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   if (handler_class_uuid)
     *handler_class_uuid = kCommandExecuteImplUuid;
   return true;
 }
 
 bool GoogleChromeDistribution::AppHostIsSupported() {
   return true;
 }
@@ skipping 14 matching lines @@
       product_guid());
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeDistribution::HasUserExperiments() {
   return true;
 }