Index: chrome/installer/setup/uninstall.cc |
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc |
index 3e34d577caa9ae0256c0975b37ca880ee10406ea..88e799fd28c839e2db2b2b27b57dff01cc9bcf92 100644 |
--- a/chrome/installer/setup/uninstall.cc |
+++ b/chrome/installer/setup/uninstall.cc |
@@ -127,6 +127,18 @@ void ProcessGoogleUpdateItems( |
} |
} |
+void ProcessOnOsUpgradeWorkItems( |
+ const installer::InstallerState& installer_state, |
+ const installer::InstallationState& machine_state, |
grt (UTC plus 2)
2012/08/30 04:15:25
unused
huangs
2012/08/30 17:13:07
Done.
|
+ const installer::Product& product) { |
+ scoped_ptr<WorkItemList> work_item_list( |
+ WorkItem::CreateNoRollbackWorkItemList()); |
+ AddOsUpgradeWorkItems(installer_state, NULL, NULL, product, |
+ work_item_list.get()); |
+ if (!work_item_list->Do()) |
+ LOG(ERROR) << "Failed to update on-os-upgrade command."; |
grt (UTC plus 2)
2012/08/30 04:15:25
should "update" be "remove"?
huangs
2012/08/30 17:13:07
Done.
|
+} |
+ |
// Adds or removes the quick-enable-cf command to the binaries' version key in |
// the registry as needed. |
void ProcessQuickEnableWorkItems( |
@@ -1066,6 +1078,8 @@ InstallStatus UninstallProduct(const InstallationState& original_state, |
ProcessDelegateExecuteWorkItems(installer_state, product); |
+ ProcessOnOsUpgradeWorkItems(installer_state, original_state, product); |
+ |
// TODO(gab): This is only disabled for M22 as the shortcut CL using Active |
// Setup will not make it in M22. |
#if 0 |