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 19 matching lines @@
 #include "content/public/common/result_codes.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 namespace {
 
 const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const wchar_t kBrowserAppId[] = L"Chrome";
 const wchar_t kCommandExecuteImplUuid[] =
     L"{5C65F4B0-3651-4514-B207-D10CB699B14B}";
+const int kAppLauncherIconIndex = 5;
 
 // Substitute the locale parameter in uninstall URL with whatever
 // Google Update tells us is the locale. In case we fail to find
 // the locale, we use US English.
 string16 LocalizeUrl(const wchar_t* url) {
   string16 language;
   if (!GoogleUpdateSettings::GetLanguage(&language))
     language = L"en-US";  // Default to US English.
   return ReplaceStringPlaceholders(url, language.c_str(), NULL);
 }
@@ skipping 68 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) {
+  int string_id = IDS_PRODUCT_NAME_BASE;
+  switch (shortcut_type) {
+    case SHORTCUT_CHROME_ALTERNATE:
+      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);
 }
 
-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) {
+  // The Google Chrome App Launcher icon is index 5; see chrome_exe.rc.

[grt (UTC plus 2), 2013/07/16 19:38:44]

please move this comment to the definition of kAppLauncherIconIndex.

[calamity, 2013/07/18 07:56:14]

Done.

+  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
+    return kAppLauncherIconIndex;
+  DCHECK(shortcut_type == SHORTCUT_CHROME ||
+         shortcut_type == SHORTCUT_CHROME_ALTERNATE) << shortcut_type;
+  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;
 }