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

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

Issue 300593002: Make omaha, gcapi and uninstall registry accesses use Wow6432Node on 64-bit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/installer/setup/setup_main.cc ('k') | chrome/installer/util/app_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 09a9502cb5ca600c7f939ff41171e310de259922..0f04768538a3b6fcc1849c2dbf45d67360404b61 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -97,7 +97,7 @@ void AddChannelValueUpdateWorkItems(
BrowserDistribution::GetSpecificDistribution(dist_type);
update_list->AddSetRegValueWorkItem(reg_root,
other_dist->GetStateKey(),
- WorkItem::kWow64Default,
+ KEY_WOW64_32KEY,
google_update::kRegApField,
channel_info.value(),
true);
@@ -1179,14 +1179,13 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
// Remove Control Panel uninstall link.
if (product.ShouldCreateUninstallEntry()) {
- InstallUtil::DeleteRegistryKey(reg_root,
- browser_dist->GetUninstallRegPath(),
- WorkItem::kWow64Default);
+ InstallUtil::DeleteRegistryKey(
+ reg_root, browser_dist->GetUninstallRegPath(), KEY_WOW64_32KEY);
}
// Remove Omaha product key.
- InstallUtil::DeleteRegistryKey(reg_root, browser_dist->GetVersionKey(),
- WorkItem::kWow64Default);
+ InstallUtil::DeleteRegistryKey(
+ reg_root, browser_dist->GetVersionKey(), KEY_WOW64_32KEY);
// Also try to delete the MSI value in the ClientState key (it might not be
// there). This is due to a Google Update behaviour where an uninstall and a
@@ -1281,7 +1280,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
InstallUtil::DeleteRegistryKey(
reg_root,
shadow_app_launcher_dist->GetVersionKey(),
- WorkItem::kWow64Default);
+ KEY_WOW64_32KEY);
}
}
}
« no previous file with comments | « chrome/installer/setup/setup_main.cc ('k') | chrome/installer/util/app_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698