Refactor of BrowserDistribution.

chrome/installer/util/google_chrome_sxs_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 implementation of GoogleChromeSxSDistribution.
 
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 
 GoogleChromeSxSDistribution::GoogleChromeSxSDistribution()
     : GoogleChromeDistribution() {
   GoogleChromeDistribution::set_product_guid(kChromeSxSGuid);
 }
 
 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(
+    ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+      return GetBaseAppName();

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

Should be 
installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
no?

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

Done.

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

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

Make this a constant now that it is used in multiple places.

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

Where should I put it?

[gab, 2013/06/27 11:49:43]

Good question. There is already a localized string for it
(IDS_OEM_MAIN_SHORTCUT_NAME_BASE); perhaps it makes sense to use this here as in
google_chrome_distribution.cc and have a chromium version of this string for the
other instance of this in browser_distribution.cc (or leave that one hardcoded
for now?)?

Otherwise I guess the only common, yet non-public, place to put it would be
either:
1) As a protected member of the BrowserDistribution class.
2) In an internals:: namespace in browser_distribution.h (e.g., it's public, but
clear by namespace naming that it shouldn't be used outside; we use that
paradigm in a few places in chrome already, but I don't think it's worth it for
this simple use-case...). 

[calamity, 2013/07/05 09:00:29]

IDS_OEM_MAIN_SHORTCUT_NAME_BASE is "Internet Browser", not "The Internet". I
don't think I want to change that.

Made it a static protected member of BrowserDistribution.

+    case SHORTCUT_APP_LAUNCHER:
+      return L"Chrome App Launcher Canary";

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

Add TODO here to localize this as in google_chrome_distribution?

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

Done.

+    default:
+      NOTREACHED();
+      return string16();
+  }
 }
 
 string16 GoogleChromeSxSDistribution::GetBaseAppId() {
   return kBrowserAppId;
 }
 
 string16 GoogleChromeSxSDistribution::GetInstallSubDir() {
   return GoogleChromeDistribution::GetInstallSubDir().append(
       installer::kSxSSuffix);
 }
 
 string16 GoogleChromeSxSDistribution::GetUninstallRegPath() {
   return GoogleChromeDistribution::GetUninstallRegPath().append(
       installer::kSxSSuffix);
 }
 
 bool GoogleChromeSxSDistribution::CanSetAsDefault() {
   return false;
 }
 
-int GoogleChromeSxSDistribution::GetIconIndex() {
-  return kSxSIconIndex;
+int GoogleChromeSxSDistribution::GetIconIndex(ShortcutEnum shortcut_enum) {
+  switch (shortcut_enum) {
+    case SHORTCUT_CHROME:
+    case SHORTCUT_ALTERNATE_CHROME:
+      return kSxSIconIndex;
+    case SHORTCUT_APP_LAUNCHER:
+      return 5;
+    default:
+      NOTREACHED();
+      return 0;
+  }
 }
 
 bool GoogleChromeSxSDistribution::GetChromeChannel(string16* channel) {
   *channel = kChannelName;
   return true;
 }
 
 bool GoogleChromeSxSDistribution::GetCommandExecuteImplClsid(
     string16* handler_class_uuid) {
   return false;
 }
 
 bool GoogleChromeSxSDistribution::AppHostIsSupported() {
   return false;
 }
 
 bool GoogleChromeSxSDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeSxSDistribution::HasUserExperiments() {
   return true;
 }
 
 string16 GoogleChromeSxSDistribution::ChannelName() {
   return kChannelName;
 }