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

Unified Diff: chrome/installer/util/installer_state.cc

Issue 1882923003: Add best-effort/allow rollback flags on WorkItem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simple_list_tests
Patch Set: fix build error 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
Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 56b701d0c980140c025b8bda1de1a50cf7fceb3d..d9d9faec9c3ede960e42a8defd416493bc6a7f2e 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -671,8 +671,10 @@ void InstallerState::WriteInstallerResult(
int string_resource_id,
const std::wstring* const launch_cmd) const {
// Use a no-rollback list since this is a best-effort deal.
- std::unique_ptr<WorkItemList> install_list(
- WorkItem::CreateNoRollbackWorkItemList());
+ std::unique_ptr<WorkItemList> install_list(WorkItem::CreateWorkItemList());
+ install_list->set_log_message("Write Installer Result");
+ install_list->set_best_effort(true);
+ install_list->set_rollback_enabled(false);
const bool system_install = this->system_install();
// Write the value for all products upon which we're operating.
Products::const_iterator end = products().end();
@@ -688,8 +690,7 @@ void InstallerState::WriteInstallerResult(
system_install, multi_package_binaries_distribution()->GetStateKey(),
status, string_resource_id, launch_cmd, install_list.get());
}
- if (!install_list->Do())
- LOG(ERROR) << "Failed to record installer error information in registry.";
+ install_list->Do();
}
bool InstallerState::RequiresActiveSetup() const {

Powered by Google App Engine
This is Rietveld 408576698