Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5697)

Unified Diff: chrome/installer/setup/install.cc

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update .gn file; remove TODO's. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index f4c091b0c50b8d686830447091ffb3755fb6e6c7..d94824d9507080e37e95fb6f8d69d092528a13f3 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -258,23 +258,6 @@ void CleanupLegacyShortcuts(const installer::InstallerState& installer_state,
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 {
@@ -529,22 +512,6 @@ InstallStatus InstallOrUpdateProduct(
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.

Powered by Google App Engine
This is Rietveld 408576698