Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER

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 14 matching lines @@
 }  // namespace
 
 GoogleChromeSxSDistribution::GoogleChromeSxSDistribution()
     : GoogleChromeDistribution(std::unique_ptr<AppRegistrationData>(
           new UpdatingAppRegistrationData(kChromeSxSGuid))) {}
 
 base::string16 GoogleChromeSxSDistribution::GetBaseAppName() {
   return L"Google Chrome Canary";
 }
 
-base::string16 GoogleChromeSxSDistribution::GetShortcutName(
-    ShortcutType shortcut_type) {
-  switch (shortcut_type) {
-    case SHORTCUT_APP_LAUNCHER:
-      return installer::GetLocalizedString(
-          IDS_APP_LIST_SHORTCUT_NAME_CANARY_BASE);
-    default:
-      DCHECK_EQ(SHORTCUT_CHROME, shortcut_type);
-      return installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
-  }
+base::string16 GoogleChromeSxSDistribution::GetShortcutName() {
+  return installer::GetLocalizedString(IDS_SXS_SHORTCUT_NAME_BASE);
 }
 
 base::string16 GoogleChromeSxSDistribution::GetStartMenuShortcutSubfolder(
     Subfolder subfolder_type) {
   switch (subfolder_type) {
     case SUBFOLDER_APPS:
       return installer::GetLocalizedString(
           IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY_BASE);
     default:
       DCHECK_EQ(subfolder_type, SUBFOLDER_CHROME);
-      return GetShortcutName(SHORTCUT_CHROME);
+      return GetShortcutName();
   }
 }
 
 base::string16 GoogleChromeSxSDistribution::GetBaseAppId() {
   return kBrowserAppId;
 }
 
 base::string16 GoogleChromeSxSDistribution::GetBrowserProgIdPrefix() {
   return kBrowserProgIdPrefix;
 }
@@ skipping 10 matching lines @@
 base::string16 GoogleChromeSxSDistribution::GetUninstallRegPath() {
   return GoogleChromeDistribution::GetUninstallRegPath().append(
       installer::kSxSSuffix);
 }
 
 BrowserDistribution::DefaultBrowserControlPolicy
     GoogleChromeSxSDistribution::GetDefaultBrowserControlPolicy() {
   return DEFAULT_BROWSER_OS_CONTROL_ONLY;
 }
 
-int GoogleChromeSxSDistribution::GetIconIndex(ShortcutType shortcut_type) {
-  if (shortcut_type == SHORTCUT_APP_LAUNCHER)
-    return icon_resources::kSxSAppLauncherIndex;
-  DCHECK_EQ(SHORTCUT_CHROME, shortcut_type);
+int GoogleChromeSxSDistribution::GetIconIndex() {
   return icon_resources::kSxSApplicationIndex;
 }
 
 bool GoogleChromeSxSDistribution::GetChromeChannel(base::string16* channel) {
   *channel = kChannelName;
   return true;
 }
 
 base::string16 GoogleChromeSxSDistribution::GetCommandExecuteImplClsid() {
   return kCommandExecuteImplUuid;
 }
 
 bool GoogleChromeSxSDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeSxSDistribution::HasUserExperiments() {
   return true;
 }
 
 base::string16 GoogleChromeSxSDistribution::ChannelName() {
   return kChannelName;
 }