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

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

Issue 2621713004: Remove *BinariesDistribution and ChromeBinariesOperations from installer_util. (Closed)
Patch Set: sync to position 442533 Created 3 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
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/util/browser_distribution.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker.cc
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 156306428c1084048b675125feed1d95cfd8691d..4b63c2a7106869a5b11e16d0822abc1a2b76583a 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -427,7 +427,7 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
true);
// MSI installations will manage their own uninstall shortcuts.
- if (!installer_state.is_msi() && product.ShouldCreateUninstallEntry()) {
+ if (!installer_state.is_msi()) {
// We need to quote the command line for the Add/Remove Programs dialog.
base::CommandLine quoted_uninstall_cmd(installer_path);
DCHECK_EQ(quoted_uninstall_cmd.GetCommandLineString()[0], '"');
@@ -669,10 +669,8 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
// We want MSI installs to take over the Add/Remove Programs entry. Make a
// best-effort attempt to delete any entry left over from previous non-MSI
// installations for the same type of install (system or per user).
- if (product.ShouldCreateUninstallEntry()) {
- AddDeleteUninstallEntryForMSIWorkItems(installer_state, product,
- post_install_task_list);
- }
+ AddDeleteUninstallEntryForMSIWorkItems(installer_state, product,
+ post_install_task_list);
}
return true;
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/util/browser_distribution.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698