Refactor of BrowserDistribution.

chrome/installer/util/google_chrome_sxs_distribution.cc

Index: chrome/installer/util/google_chrome_sxs_distribution.cc
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index 5224a8cfef6a47566c57bd631ae2254afc59f6d0..2bf42784ddb334354cbb799ab1f0380ff21909bb 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -29,10 +29,20 @@ string16 GoogleChromeSxSDistribution::GetBaseAppName() {
   return L"Google Chrome Canary";
 }
 
-string16 GoogleChromeSxSDistribution::GetAppShortCutName() {
-  const string16& shortcut_name =
-      installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
-  return shortcut_name;
+string16 GoogleChromeSxSDistribution::GetShortcutName(
+    ShortcutType shortcut_type) {
+  switch (shortcut_type) {

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

I think it's bad for this to ever return the empty string. How about:
  switch (shortcut_type) {
    case SHORTCUT_ALTERNATE_CHROME:
      // This should never be called. Returning the same string as Google Chrome
      // preserves behavior, but it will result in a naming collision.
      NOTREACHED();
      return GoogleChromeDistribution::GetShortcutName(shortcut_type);
    case SHORTCUT_APP_LAUNCHER:
      return installer::GetLocalizedString(
          IDS_APP_LIST_SHORTCUT_NAME_CANARY_BASE);
    default:
      DCHECK_EQ(shortcut_type, SHORTCUT_CHROME);
      return installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
  }

You'll need to add IDS_APP_LIST_SHORTCUT_NAME_CANARY to kStringIds in
chrome/installer/util/prebuild/create_string_rc.py.

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

Done.

+    case SHORTCUT_CHROME:
+      return GetBaseAppName();

[gab, 2013/07/05 14:23:37]

Make this
installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
now that GetBaseAppName() is hardcoded though.

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

Done.

+    case SHORTCUT_ALTERNATE_CHROME:
+      return L"The Internet";

[gab, 2013/07/05 14:23:37]

Actually, this should just use
GoogleChromeDsitribution::GetShortcutName(SHORTCUT_ALTERNATE_CHROME);
I think, to keep the old behavior.

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

Done.

+    case SHORTCUT_APP_LAUNCHER:
+      // TODO(calamity): Replace with a localized string.
+      return L"Chrome App Launcher Canary";
+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
 string16 GoogleChromeSxSDistribution::GetBaseAppId() {
@@ -53,8 +63,17 @@ bool GoogleChromeSxSDistribution::CanSetAsDefault() {
   return false;
 }
 
-int GoogleChromeSxSDistribution::GetIconIndex() {
-  return kSxSIconIndex;
+int GoogleChromeSxSDistribution::GetIconIndex(ShortcutType shortcut_type) {
+  switch (shortcut_type) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      return kSxSIconIndex;
+    case SHORTCUT_APP_LAUNCHER:
+      return 5;
+    default:
+      NOTREACHED();
+      return 0;

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

this should never return 0, since that would result in the regular chrome icon.
how about:
  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
    return kSxSAppLauncherIconIndex;  (6, defined in the unnamed namespace)
  DCHECK(shortcut_type == SHORTCUT_CHROME ||
         shortcut_type == SHORTCUT_ALTERNATE_CHROME) << shortcut_type;
  return kSxSIconIndex;

Also, please make kSxSAppLauncherIconIndexa file-local constant in the unnamed
namespace and put a comment next to it along the lines of
// The Chrome App Launcher Canary icon is index 6; see chrome_exe.rc.

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

Done.

+  }
 }
 
 bool GoogleChromeSxSDistribution::GetChromeChannel(string16* channel) {