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

Unified Diff: chrome/installer/util/copy_reg_key_work_item.h

Issue 7976045: Fix in-use updates for Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sanity check before dcommit Created 9 years, 3 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/copy_reg_key_work_item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/copy_reg_key_work_item.h
diff --git a/chrome/installer/util/copy_reg_key_work_item.h b/chrome/installer/util/copy_reg_key_work_item.h
index b1d463100d1caec2488e530bac2539fb979304ba..cba85fef09036c9e7f2c3bf111f04b428234f61e 100644
--- a/chrome/installer/util/copy_reg_key_work_item.h
+++ b/chrome/installer/util/copy_reg_key_work_item.h
@@ -28,9 +28,11 @@ class CopyRegKeyWorkItem : public WorkItem {
friend class WorkItem;
// Neither |source_key_path| nor |dest_key_path| may be empty.
+ // Only ALWAYS and IF_NOT_PRESENT are supported for |overwrite_option|.
CopyRegKeyWorkItem(HKEY predefined_key,
const std::wstring& source_key_path,
- const std::wstring& dest_key_path);
+ const std::wstring& dest_key_path,
+ CopyOverWriteOption overwrite_option);
// Root key in which we operate. The root key must be one of the predefined
// keys on Windows.
@@ -42,9 +44,14 @@ class CopyRegKeyWorkItem : public WorkItem {
// Path of the destination key.
std::wstring dest_key_path_;
+ CopyOverWriteOption overwrite_option_;
+
// Backup of the destination key.
RegistryKeyBackup backup_;
+ // Set to true after the destination is cleared for the copy.
+ bool cleared_destination_;
+
DISALLOW_COPY_AND_ASSIGN(CopyRegKeyWorkItem);
};
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/copy_reg_key_work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698