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

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

Issue 1982653002: Add best-effort/allow rollback flags on WorkItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't remove code from app_launcher_installer.cc Created 4 years, 7 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 | « chrome/chrome_installer.gypi ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/app_launcher_installer.cc
diff --git a/chrome/installer/setup/app_launcher_installer.cc b/chrome/installer/setup/app_launcher_installer.cc
index 46670faa2d0fdbe3f8a8ef96f424e1ff2dffc629..e119699c1bb546203c11cf2c3aaf3b109e662f91 100644
--- a/chrome/installer/setup/app_launcher_installer.cc
+++ b/chrome/installer/setup/app_launcher_installer.cc
@@ -45,11 +45,11 @@ void AddLegacyAppCommandRemovalItem(const InstallerState& installer_state,
WorkItemList* list) {
// Ignore failures since this is a clean-up operation and shouldn't block
// install or update.
- list->AddDeleteRegKeyWorkItem(
- installer_state.root_key(),
- GetRegistrationDataCommandKey(reg_data, name),
- KEY_WOW64_32KEY)
- ->set_ignore_failure(true);
+ auto* delete_reg_key_work_item = list->AddDeleteRegKeyWorkItem(
+ installer_state.root_key(), GetRegistrationDataCommandKey(reg_data, name),
+ KEY_WOW64_32KEY);
+ delete_reg_key_work_item->set_best_effort(true);
+ delete_reg_key_work_item->set_rollback_enabled(false);
}
} // namespace
@@ -79,9 +79,10 @@ void AddRemoveLegacyAppHostExeWorkItems(const base::FilePath& target_path,
const base::FilePath& temp_path,
WorkItemList* list) {
DCHECK(!InstallUtil::IsChromeSxSProcess());
- list->AddDeleteTreeWorkItem(
- target_path.Append(kLegacyChromeAppHostExe),
- temp_path)->set_ignore_failure(true);
+ auto* delete_tree_work_item = list->AddDeleteTreeWorkItem(
+ target_path.Append(kLegacyChromeAppHostExe), temp_path);
+ delete_tree_work_item->set_best_effort(true);
+ delete_tree_work_item->set_rollback_enabled(false);
}
void AddRemoveLegacyAppCommandsWorkItems(const InstallerState& installer_state,
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698