Refactor of BrowserDistribution.

chrome/installer/util/browser_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 class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 21 matching lines @@
 using installer::MasterPreferences;
 
 namespace {
 
 const wchar_t kChromiumActiveSetupGuid[] =
     L"{7D2B3E1D-D096-4594-9D8F-A6667F12E0AC}";
 
 const wchar_t kCommandExecuteImplUuid[] =
     L"{A2DF06F9-A21A-44A8-8A99-8B9C84F29160}";
 
+// The Chromium App Launcher icon is index 1; see chrome_exe.rc.
+const int kAppLauncherIconIndex = 1;
+
 // The BrowserDistribution objects are never freed.
 BrowserDistribution* g_browser_distribution = NULL;
 BrowserDistribution* g_chrome_frame_distribution = NULL;
 BrowserDistribution* g_binaries_distribution = NULL;
 BrowserDistribution* g_chrome_app_host_distribution = NULL;
 
 // Returns true if currently running in npchrome_frame.dll
 bool IsChromeFrameModule() {
   base::FilePath module_path;
   PathService::Get(base::FILE_MODULE, &module_path);
@@ skipping 95 matching lines @@
 }
 
 string16 BrowserDistribution::GetAppGuid() {
   return L"";
 }
 
 string16 BrowserDistribution::GetBaseAppName() {
   return L"Chromium";
 }
 
-string16 BrowserDistribution::GetAppShortCutName() {
-  return GetBaseAppName();
+string16 BrowserDistribution::GetDisplayName() {
+  return GetShortcutName(SHORTCUT_CHROME);
 }
 
-string16 BrowserDistribution::GetAlternateApplicationName() {
-  return L"The Internet";
+string16 BrowserDistribution::GetShortcutName(ShortcutType shortcut_type) {
+  switch (shortcut_type) {
+    case SHORTCUT_CHROME_ALTERNATE:
+      // TODO(calamity): Change IDS_OEM_MAIN_SHORTCUT_NAME in
+      // chromium_strings.grd to "The Internet" (so that it doesn't collide with
+      // the value in google_chrome_strings.grd) then change this to
+      // installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE)
+      return L"The Internet";
+    case SHORTCUT_APP_LAUNCHER:
+      return installer::GetLocalizedString(IDS_APP_LIST_SHORTCUT_NAME_BASE);
+    default:
+      DCHECK_EQ(shortcut_type, SHORTCUT_CHROME);
+      return GetBaseAppName();
+  }
+}
+
+int BrowserDistribution::GetIconIndex(ShortcutType shortcut_type) {
+  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
+    return kAppLauncherIconIndex;
+  DCHECK(shortcut_type == SHORTCUT_CHROME ||
+         shortcut_type == SHORTCUT_CHROME_ALTERNATE) << shortcut_type;
+  return 0;
+}
+
+string16 BrowserDistribution::GetIconFilename() {
+  return string16();
+}
+
+string16 BrowserDistribution::GetStartMenuShortcutSubfolder(
+    Subfolder subfolder_type) {
+  switch (subfolder_type) {

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

remove this switch statement. the only two lines needed in this function are the
DCHECK and the return.

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

Done.

+    case SUBFOLDER_CHROME:
+      return GetShortcutName(SHORTCUT_CHROME);
+    default:
+      DCHECK_EQ(subfolder_type, SUBFOLDER_CHROME);
+      return GetShortcutName(SHORTCUT_CHROME);
+  }
 }
 
 string16 BrowserDistribution::GetBaseAppId() {
   return L"Chromium";
 }
 
 string16 BrowserDistribution::GetInstallSubDir() {
   return L"Chromium";
 }
 
@@ skipping 48 matching lines @@
 }
 
 bool BrowserDistribution::CanSetAsDefault() {
   return true;
 }
 
 bool BrowserDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
-string16 BrowserDistribution::GetIconFilename() {
-  return string16();
-}
-
-int BrowserDistribution::GetIconIndex() {
-  // Assuming that main icon appears first alphabetically in the resource file
-  // for GetIconFilename().
-  return 0;
-}
-
 bool BrowserDistribution::GetChromeChannel(string16* channel) {
   return false;
 }
 
 bool BrowserDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   if (handler_class_uuid)
     *handler_class_uuid = kCommandExecuteImplUuid;
   return true;
 }
 
 bool BrowserDistribution::AppHostIsSupported() {
   return false;
 }
 
 void BrowserDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 }
 
 bool BrowserDistribution::ShouldSetExperimentLabels() {
   return false;
 }
 
 bool BrowserDistribution::HasUserExperiments() {
   return false;
 }