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 136 matching lines @@
 }
 
 string16 BrowserDistribution::GetAppGuid() {
   return L"";
 }
 
 string16 BrowserDistribution::GetBaseAppName() {
   return L"Chromium";
 }
 
-string16 BrowserDistribution::GetAppShortCutName() {
-  return GetBaseAppName();
+string16 BrowserDistribution::GetDisplayName() {
+  return GetShortcutInfo(SHORTCUT_CHROME).name;
 }
 
-string16 BrowserDistribution::GetAlternateApplicationName() {
-  return L"The Internet";
+BrowserDistribution::ShortcutInfo BrowserDistribution::GetShortcutInfo(
+    ShortcutEnum shortcut_enum) {
+  ShortcutInfo info;
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      info.name = GetBaseAppName();
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_ALTERNATE_CHROME:
+      info.name = L"The Internet";
+      info.icon_index = 0;
+      break;
+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.

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

I don't think we have localized Chromium strings in the installer.

[grt (UTC plus 2), 2013/05/29 13:50:09]

Although this wasn't always the case, I think it is now.

+      info.name = L"Chromium App Launcher";
+      info.icon_index = 1;
+      break;
+    default:
+      NOTREACHED();
+      return ShortcutInfo();
+  }
+  return info;
+}
+
+string16 BrowserDistribution::GetStartMenuShortcutSubfolder(
+    SubfolderEnum subfolder_enum) {
+  switch (subfolder_enum) {
+    case SUBFOLDER_CHROME:
+      return GetShortcutInfo(SHORTCUT_CHROME).name;
+      break;
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
 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;
 }
+

[grt (UTC plus 2), 2013/05/29 13:50:09]

is this an extra blank line? if so, please remove.

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

Done.