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::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) {
+  switch (shortcut_type) {

[grt (UTC plus 2), 2013/07/05 17:27:37]

as elsewhere:
  DCHECK_EQ(shortcut_type, SHORTCUT_APP_LAUNCHER);
  return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);

[calamity, 2013/07/16 04:05:17]

Done.

+    case SHORTCUT_APP_LAUNCHER:
+      return installer::GetLocalizedString(IDS_PRODUCT_APP_LAUNCHER_NAME_BASE);
+    default:
+      NOTREACHED();
+      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 63 matching lines @@
 
 bool ChromeAppHostDistribution::CanSetAsDefault() {
   return false;
 }
 
 bool ChromeAppHostDistribution::CanCreateDesktopShortcuts() {
   return true;
 }
 
 string16 ChromeAppHostDistribution::GetIconFilename() {
   return installer::kChromeAppHostExe;

[grt (UTC plus 2), 2013/07/05 17:27:37]

Is this correct now? Shouldn't the IDR_X_APP_LIST (1 or 5) or IDR_X_APP_LIST_SXS
(6) icon in chrome.exe be used for the app launcher? Shouldn't all code that
used to get the app launcher icon by way of ChromeAppHostDistribution now
instead get it by way of the active Type=CHROME_BROWSER BrowserDistribution? Is
ChromeAppHostOperations every used (by way of instantiating Product for a
CHROME_APP_HOST distribution)?

[gab, 2013/07/08 12:59:02]

@huangs: I'm not sure what the exact current state is, let's put a plan together
to remove ChromeAppHostDistribution (and product) and make sure this CL is
inline with this plan.

Having a distribution that has to know about Google Chrome, Canary, and Chromium
just doesn't make sense (hence why we are introducing app launcher knowledge in
the distributions in this CL).

I'm ok with getting rid of the CAHD as a follow-up step, but this CL and the
CAHD shouldn't co-exist for long or things will get confusing.

[grt (UTC plus 2), 2013/07/08 15:15:50]

Just a thought: if it's a challenge to get rid of ChromeAppHostDistribution in
the short term, does it make sense to modify its implementation so that it
delegates to the active Type=CHROME_BROWSER BrowserDistribution? This could help
mitigate the risks associated with having two implementations for the same
thing. I haven't thought this through in detail, so I'm not sure it makes
absolute sense.

[gab, 2013/07/08 15:22:41]

I thought about that too, but it feels scary to me, we can think about this some
more if you insist, but I'd really rather get rid of CAHD asap (is that
possible?).

[huangs, 2013/07/08 19:43:57]

+1 for removing CAHD, and planning. But I think this CL should focus on changing
the interfaces; so we can tolerate some ugliness in the implementation (with
proper TODO tags).

 }
 
 bool ChromeAppHostDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;
 }
 
 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
 }