Index: chrome/installer/util/work_item_list.cc |
diff --git a/chrome/installer/util/work_item_list.cc b/chrome/installer/util/work_item_list.cc |
index fd00773675b5c987c84354f42656f5a3e9dc2cac..e4566a68a1be776e9045819908b9d1ddccf1ce71 100644 |
--- a/chrome/installer/util/work_item_list.cc |
+++ b/chrome/installer/util/work_item_list.cc |
@@ -85,9 +85,14 @@ WorkItem* WorkItemList::AddCopyRegKeyWorkItem( |
HKEY predefined_root, |
const std::wstring& source_key_path, |
const std::wstring& dest_key_path, |
- CopyOverWriteOption overwrite_option) { |
+ CopyOverWriteOption overwrite_option, |
+ RegWow64ViewOption reg_wow64_option) { |
WorkItem* item = WorkItem::CreateCopyRegKeyWorkItem( |
- predefined_root, source_key_path, dest_key_path, overwrite_option); |
+ predefined_root, |
+ source_key_path, |
+ dest_key_path, |
+ overwrite_option, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
@@ -114,16 +119,26 @@ WorkItem* WorkItemList::AddCreateDirWorkItem(const base::FilePath& path) { |
return item; |
} |
-WorkItem* WorkItemList::AddCreateRegKeyWorkItem(HKEY predefined_root, |
- const std::wstring& path) { |
- WorkItem* item = WorkItem::CreateCreateRegKeyWorkItem(predefined_root, path); |
+WorkItem* WorkItemList::AddCreateRegKeyWorkItem( |
+ HKEY predefined_root, |
+ const std::wstring& path, |
+ RegWow64ViewOption reg_wow64_option) { |
+ WorkItem* item = WorkItem::CreateCreateRegKeyWorkItem( |
+ predefined_root, |
+ path, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
-WorkItem* WorkItemList::AddDeleteRegKeyWorkItem(HKEY predefined_root, |
- const std::wstring& path) { |
- WorkItem* item = WorkItem::CreateDeleteRegKeyWorkItem(predefined_root, path); |
+WorkItem* WorkItemList::AddDeleteRegKeyWorkItem( |
+ HKEY predefined_root, |
+ const std::wstring& path, |
+ RegWow64ViewOption reg_wow64_option) { |
+ WorkItem* item = WorkItem::CreateDeleteRegKeyWorkItem( |
+ predefined_root, |
+ path, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
@@ -131,9 +146,13 @@ WorkItem* WorkItemList::AddDeleteRegKeyWorkItem(HKEY predefined_root, |
WorkItem* WorkItemList::AddDeleteRegValueWorkItem( |
HKEY predefined_root, |
const std::wstring& key_path, |
- const std::wstring& value_name) { |
- WorkItem* item = WorkItem::CreateDeleteRegValueWorkItem(predefined_root, |
- key_path, value_name); |
+ const std::wstring& value_name, |
+ RegWow64ViewOption reg_wow64_option) { |
+ WorkItem* item = WorkItem::CreateDeleteRegValueWorkItem( |
+ predefined_root, |
+ key_path, |
+ value_name, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
@@ -171,38 +190,46 @@ WorkItem* WorkItemList::AddSetRegValueWorkItem( |
const std::wstring& key_path, |
const std::wstring& value_name, |
const std::wstring& value_data, |
- bool overwrite) { |
+ bool overwrite, |
+ RegWow64ViewOption reg_wow64_option) { |
WorkItem* item = WorkItem::CreateSetRegValueWorkItem(predefined_root, |
key_path, |
value_name, |
value_data, |
- overwrite); |
+ overwrite, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
-WorkItem* WorkItemList::AddSetRegValueWorkItem(HKEY predefined_root, |
- const std::wstring& key_path, |
- const std::wstring& value_name, |
- DWORD value_data, |
- bool overwrite) { |
+WorkItem* WorkItemList::AddSetRegValueWorkItem( |
+ HKEY predefined_root, |
+ const std::wstring& key_path, |
+ const std::wstring& value_name, |
+ DWORD value_data, |
+ bool overwrite, |
+ RegWow64ViewOption reg_wow64_option) { |
WorkItem* item = WorkItem::CreateSetRegValueWorkItem(predefined_root, |
key_path, |
value_name, |
value_data, |
- overwrite); |
+ overwrite, |
+ reg_wow64_option); |
AddWorkItem(item); |
return item; |
} |
-WorkItem* WorkItemList::AddSetRegValueWorkItem(HKEY predefined_root, |
- const std::wstring& key_path, |
- const std::wstring& value_name, |
- int64 value_data, |
- bool overwrite) { |
+WorkItem* WorkItemList::AddSetRegValueWorkItem( |
+ HKEY predefined_root, |
+ const std::wstring& key_path, |
+ const std::wstring& value_name, |
+ int64 value_data, |
+ bool overwrite, |
+ RegWow64ViewOption reg_wow64_option) { |
WorkItem* item = reinterpret_cast<WorkItem*>( |
- WorkItem::CreateSetRegValueWorkItem(predefined_root, key_path, value_name, |
- value_data, overwrite)); |
+ WorkItem::CreateSetRegValueWorkItem( |
+ predefined_root, key_path, value_name, |
+ value_data, overwrite, reg_wow64_option)); |
AddWorkItem(item); |
return item; |
} |