[Installer] Cleaning up dead code for App Launcher / App Host installs.

chrome/installer/setup/install.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.
 
 #include "chrome/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 240 matching lines @@
   ShellUtil::ShellChange shortcut_level = installer_state.system_install() ?
       ShellUtil::SYSTEM_LEVEL : ShellUtil::CURRENT_USER;
   base::FilePath uninstall_shortcut_path;
   ShellUtil::GetShortcutPath(ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
                              dist, shortcut_level, &uninstall_shortcut_path);
   uninstall_shortcut_path = uninstall_shortcut_path.Append(
       dist->GetUninstallLinkName() + installer::kLnkExt);
   base::DeleteFile(uninstall_shortcut_path, false);
 }
 
-// Returns the appropriate shortcut operations for App Launcher,
-// based on state of installation and master_preferences.
-installer::InstallShortcutOperation GetAppLauncherShortcutOperation(
-    const installer::InstallationState& original_state,
-    const installer::InstallerState& installer_state) {
-  const installer::ProductState* original_app_host_state =
-      original_state.GetProductState(installer_state.system_install(),
-                                     BrowserDistribution::CHROME_APP_HOST);
-  bool app_launcher_exists = original_app_host_state &&
-      original_app_host_state->uninstall_command()
-          .HasSwitch(installer::switches::kChromeAppLauncher);
-  if (!app_launcher_exists)
-    return installer::INSTALL_SHORTCUT_CREATE_ALL;
-
-  return installer::INSTALL_SHORTCUT_REPLACE_EXISTING;
-}
-
 }  // end namespace
 
 namespace installer {
 
 void EscapeXmlAttributeValueInSingleQuotes(base::string16* att_value) {
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("&"),
                      base::ASCIIToUTF16("&amp;"), att_value);
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("'"),
                      base::ASCIIToUTF16("&apos;"), att_value);
   base::ReplaceChars(*att_value, base::ASCIIToUTF16("<"),
@@ skipping 234 matching lines @@
     // installed and for the binaries in case of multi-install.
     installer_state.UpdateChannels();
 
     installer_state.UpdateStage(installer::COPYING_PREFERENCES_FILE);
 
     if (result == FIRST_INSTALL_SUCCESS && !prefs_path.empty())
       CopyPreferenceFileForFirstRun(installer_state, prefs_path);
 
     installer_state.UpdateStage(installer::CREATING_SHORTCUTS);
 
-    const installer::Product* app_launcher_product =
-        installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST);
-    // Creates shortcuts for App Launcher.
-    if (app_launcher_product) {
-      // TODO(huangs): Remove this check once we have system-level App Host.
-      DCHECK(!installer_state.system_install());
-      const base::FilePath app_host_exe(
-          installer_state.target_path().Append(kChromeAppHostExe));
-      InstallShortcutOperation app_launcher_shortcut_operation =
-          GetAppLauncherShortcutOperation(original_state, installer_state);
-
-      // Always install per-user shortcuts for App Launcher.
-      CreateOrUpdateShortcuts(app_host_exe, *app_launcher_product, prefs,
-                              CURRENT_USER, app_launcher_shortcut_operation);
-    }
-
     const installer::Product* chrome_product =
         installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER);
     // Creates shortcuts for Chrome.
     if (chrome_product) {
       BrowserDistribution* chrome_dist = chrome_product->distribution();
       const base::FilePath chrome_exe(
           installer_state.target_path().Append(kChromeExe));
       CleanupLegacyShortcuts(installer_state, chrome_dist, chrome_exe);
 
       // Install per-user shortcuts on user-level installs and all-users
@@ skipping 114 matching lines @@
            INSTALL_SHORTCUT_CREATE_EACH_IF_NO_SYSTEM_LEVEL);
 
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 }
 
 }  // namespace installer