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

Unified Diff: chrome/installer/util/app_command.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/uninstall.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/app_command.cc
diff --git a/chrome/installer/util/app_command.cc b/chrome/installer/util/app_command.cc
index 78d931de5f110bfc7a1f507e14d512ee8d568865..0d6be906888589ab5d11b97c33324ab3c8bbcdcf 100644
--- a/chrome/installer/util/app_command.cc
+++ b/chrome/installer/util/app_command.cc
@@ -70,12 +70,14 @@ bool AppCommand::Initialize(const base::win::RegKey& key) {
void AppCommand::AddWorkItems(HKEY predefined_root,
const base::string16& command_path,
WorkItemList* item_list) const {
+ // Command_path is derived from GetRegCommandKey which always returns
+ // value from GetVersionKey() which should be 32-bit hive.
item_list->AddCreateRegKeyWorkItem(
- predefined_root, command_path, WorkItem::kWow64Default)
+ predefined_root, command_path, KEY_WOW64_32KEY)
->set_log_message("creating AppCommand registry key");
item_list->AddSetRegValueWorkItem(predefined_root,
command_path,
- WorkItem::kWow64Default,
+ KEY_WOW64_32KEY,
google_update::kRegCommandLineField,
command_line_,
true)
@@ -90,13 +92,13 @@ void AppCommand::AddWorkItems(HKEY predefined_root,
if (var_data) {
item_list->AddSetRegValueWorkItem(predefined_root,
command_path,
- WorkItem::kWow64Default,
+ KEY_WOW64_32KEY,
var_name,
static_cast<DWORD>(1),
true);
} else {
item_list->AddDeleteRegValueWorkItem(
- predefined_root, command_path, WorkItem::kWow64Default, var_name);
+ predefined_root, command_path, KEY_WOW64_32KEY, var_name);
}
}
}
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698