Refactor of BrowserDistribution.

chrome/installer/util/chrome_app_host_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 specific implementation of BrowserDistribution class for
 // Chrome App Host. It overrides the bare minimum of methods necessary to get a
 // Chrome App Host installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_app_host_distribution.h"
@@ skipping 20 matching lines @@
 }
 
 string16 ChromeAppHostDistribution::GetAppGuid() {
   return kChromeAppHostGuid;
 }
 
 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::GetAlternateApplicationName() {
-  const string16& product_name =
-      installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
-  return product_name;
+string16 ChromeAppHostDistribution::GetShortcutName(
+    ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_APP_LAUNCHER:
+      return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
+    default:
+      NOTREACHED();

[gab, 2013/06/18 19:50:29]

As it is, GetDisplayName() will hit this for this distribution.

[calamity, 2013/06/27 01:27:44]

Done.

+      return string16();
+  }
 }
 
 string16 ChromeAppHostDistribution::GetBaseAppId() {
   // Should be same as AppListController::GetAppModelId().
   return L"ChromeAppList";
 }
 
 string16 ChromeAppHostDistribution::GetInstallSubDir() {
   return BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BINARIES)->GetInstallSubDir();
@@ skipping 80 matching lines @@
 
 void ChromeAppHostDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 #if defined(GOOGLE_CHROME_BUILD)
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       kChromeAppHostGuid);
 #endif
 }