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

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

Issue 7890069: Added CopyRegKeyWorkItem in support of IE low rights policy fixes. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: sync'd to ToT again 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
Index: chrome/installer/util/delete_reg_key_work_item.h
diff --git a/chrome/installer/util/delete_reg_key_work_item.h b/chrome/installer/util/delete_reg_key_work_item.h
index 02bc02b7113de72436881d272e1092847c2675e3..ef92364cbac39d337c5ae526ba1feec03bc97818 100644
--- a/chrome/installer/util/delete_reg_key_work_item.h
+++ b/chrome/installer/util/delete_reg_key_work_item.h
@@ -11,9 +11,12 @@
#include <string>
#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
+#include "chrome/installer/util/registry_key_backup.h"
#include "chrome/installer/util/work_item.h"
+class RegistryKeyBackup;
+
// A WorkItem subclass that deletes a registry key at the given path. Be aware
// that in the event of rollback the key's values and subkeys are restored but
// the key and its subkeys take on their default security descriptors.
@@ -21,12 +24,11 @@ class DeleteRegKeyWorkItem : public WorkItem {
public:
virtual ~DeleteRegKeyWorkItem();
- virtual bool Do();
+ virtual bool Do() OVERRIDE;
- virtual void Rollback();
+ virtual void Rollback() OVERRIDE;
private:
- class RegKeyBackup;
friend class WorkItem;
DeleteRegKeyWorkItem(HKEY predefined_root, const std::wstring& path);
@@ -39,7 +41,7 @@ class DeleteRegKeyWorkItem : public WorkItem {
std::wstring path_;
// Backup of the deleted key.
- scoped_ptr<RegKeyBackup> backup_;
+ RegistryKeyBackup backup_;
DISALLOW_COPY_AND_ASSIGN(DeleteRegKeyWorkItem);
};
« no previous file with comments | « chrome/installer/util/copy_reg_key_work_item_unittest.cc ('k') | chrome/installer/util/delete_reg_key_work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698