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

Side by Side Diff: chrome/installer/util/delete_tree_work_item.h

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_ 5 #ifndef CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
6 #define CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_ 6 #define CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "chrome/installer/util/work_item.h" 15 #include "chrome/installer/util/work_item.h"
16 16
17 // A WorkItem subclass that recursively deletes a file system hierarchy at the 17 // A WorkItem subclass that recursively deletes a file system hierarchy at the
18 // given root path. The file system hierarchy could be a single file, or a 18 // given root path. The file system hierarchy could be a single file, or a
19 // directory. 19 // directory.
20 // The file system hierarchy to be deleted can have one or more key files. If 20 // The file system hierarchy to be deleted can have one or more key files. If
21 // specified, deletion will be performed only if all key files are not in use. 21 // specified, deletion will be performed only if all key files are not in use.
22 class DeleteTreeWorkItem : public WorkItem { 22 class DeleteTreeWorkItem : public WorkItem {
23 public: 23 public:
24 ~DeleteTreeWorkItem() override; 24 ~DeleteTreeWorkItem() override;
(...skipping 26 matching lines...) Expand all
51 base::FilePath root_path_; 51 base::FilePath root_path_;
52 52
53 // Temporary directory that can be used. 53 // Temporary directory that can be used.
54 base::FilePath temp_path_; 54 base::FilePath temp_path_;
55 55
56 // The number of key files. 56 // The number of key files.
57 ptrdiff_t num_key_files_; 57 ptrdiff_t num_key_files_;
58 58
59 // Contains the paths to the key files. If specified, deletion will be 59 // Contains the paths to the key files. If specified, deletion will be
60 // performed only if none of the key files are in use. 60 // performed only if none of the key files are in use.
61 scoped_ptr<base::FilePath[]> key_paths_; 61 std::unique_ptr<base::FilePath[]> key_paths_;
62 62
63 // Contains the temp directories for the backed-up key files. The directories 63 // Contains the temp directories for the backed-up key files. The directories
64 // are created and populated in Do() as-needed. We don't use a standard 64 // are created and populated in Do() as-needed. We don't use a standard
65 // container for this since base::ScopedTempDir isn't CopyConstructible. 65 // container for this since base::ScopedTempDir isn't CopyConstructible.
66 scoped_ptr<base::ScopedTempDir[]> key_backup_paths_; 66 std::unique_ptr<base::ScopedTempDir[]> key_backup_paths_;
67 67
68 // The temporary directory into which the original root_path_ has been moved. 68 // The temporary directory into which the original root_path_ has been moved.
69 base::ScopedTempDir backup_path_; 69 base::ScopedTempDir backup_path_;
70 70
71 // Set to true once root_path_ has been moved into backup_path_. 71 // Set to true once root_path_ has been moved into backup_path_.
72 bool moved_to_backup_; 72 bool moved_to_backup_;
73 }; 73 };
74 74
75 #endif // CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_ 75 #endif // CHROME_INSTALLER_UTIL_DELETE_TREE_WORK_ITEM_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/delete_reg_value_work_item_unittest.cc ('k') | chrome/installer/util/delete_tree_work_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698