Refactor of BrowserDistribution.

This is a precursor to https://codereview.chromium.org/13864015/.

* Added GetStartMenuShortcutSubfolder, which returns the Start Menu
  subfolder path for a given subfolder.

* GetShortcutName and GetIconIndex now return data specific to a type
  of shortcut (browser, alternate name of browser, or app launcher).

* GetDisplayName is now used rather than GetAppShortcutName where a
  localized name is needed (e.g., in logs and the registry).

BUG=233434,238895,161985

Review URL: https://chromiumcodereview.appspot.com/15255004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217469 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/chrome/installer/util/chrome_app_host_distribution.cc b/chrome/installer/util/chrome_app_host_distribution.cc
index 7c40326..1c4c0e1 100644
--- a/chrome/installer/util/chrome_app_host_distribution.cc
+++ b/chrome/installer/util/chrome_app_host_distribution.cc
@@ -38,16 +38,14 @@ string16 ChromeAppHostDistribution::GetBaseAppName() {
   return L"Google Chrome App Launcher";
 }
 
-string16 ChromeAppHostDistribution::GetAppShortCutName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+string16 ChromeAppHostDistribution::GetDisplayName() {
+  return GetShortcutName(SHORTCUT_APP_LAUNCHER);
 }
 
-string16 ChromeAppHostDistribution::GetAlternateApplicationName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+string16 ChromeAppHostDistribution::GetShortcutName(
+    ShortcutType shortcut_type) {
+  DCHECK_EQ(shortcut_type, SHORTCUT_APP_LAUNCHER);
+  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppId() {