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::GetShortcutName(ShortcutType shortcut_type) {
+  switch (shortcut_type) {

[grt (UTC plus 2), 2013/07/05 17:27:37]

  int string_id = IDS_PRODUCT_NAME_BASE;
  switch (shortcut_type) {
    case SHORTCUT_ALTERNATE_CHROME:
      string_id = IDS_OEM_MAIN_SHORTCUT_NAME_BASE;
      break;
    case SHORTCUT_APP_LAUNCHER:
      string_id = IDS_APP_LIST_SHORTCUT_NAME_BASE;
      break;
    default:
      DCHECK_EQ(shortcut_type, SHORTCUT_CHROME);
      break;
  }
  return installer::GetLocalizedString(string_id);

[calamity, 2013/07/16 04:05:17]

Done.

+    case SHORTCUT_CHROME:
+      return installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
+    case SHORTCUT_ALTERNATE_CHROME:
+      return installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.
+      return L"Chrome App Launcher";
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
-string16 GoogleChromeDistribution::GetAlternateApplicationName() {
-  const string16& alt_product_name =
-      installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
-  return alt_product_name;
+int GoogleChromeDistribution::GetIconIndex(ShortcutType shortcut_type) {
+  switch (shortcut_type) {

[grt (UTC plus 2), 2013/07/05 17:27:37]

  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
    return kAppLauncherIconIndex;  (5, defined in the unnamed namespace)
  DCHECK(shortcut_type == SHORTCUT_CHROME ||
         shortcut_type == SHORTCUT_ALTERNATE_CHROME) << shortcut_type;
  return 0;

[calamity, 2013/07/16 04:05:17]

Done.

+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      return 0;
+    case SHORTCUT_APP_LAUNCHER:
+      return 6;

[grt (UTC plus 2), 2013/07/05 17:27:37]

Looks like this should be 5 according to chrome_exe.rc. Also, please make it a
file-local constant in the unnamed namespace (e.g., kAppLauncherIconIndex) and
put a comment next to it along the lines of
// The Google Chrome App Launcher icon is index 5; see chrome_exe.rc.

[calamity, 2013/07/16 04:05:17]

Done.

+    default:
+      NOTREACHED();
+      return 0;
+  }
 }
 
 string16 GoogleChromeDistribution::GetBaseAppId() {
   return kBrowserAppId;
 }
 
 string16 GoogleChromeDistribution::GetInstallSubDir() {
   string16 sub_dir(installer::kGoogleChromeInstallSubDir1);
   sub_dir.append(L"\\");
   sub_dir.append(installer::kGoogleChromeInstallSubDir2);
@@ skipping 123 matching lines @@
       product_guid());
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeDistribution::HasUserExperiments() {
   return true;
 }