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

Side by Side Diff: chrome/installer/util/conditional_work_item_list.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_CONDITIONAL_WORK_ITEM_LIST_H_ 5 #ifndef CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
6 #define CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_ 6 #define CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
7 7
8 #include "chrome/installer/util/work_item_list.h" 8 #include <memory>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "chrome/installer/util/work_item_list.h"
12 12
13 // A WorkItemList subclass that permits conditionally executing a set of 13 // A WorkItemList subclass that permits conditionally executing a set of
14 // WorkItems. 14 // WorkItems.
15 class ConditionalWorkItemList : public WorkItemList { 15 class ConditionalWorkItemList : public WorkItemList {
16 public: 16 public:
17 explicit ConditionalWorkItemList(Condition* condition); 17 explicit ConditionalWorkItemList(Condition* condition);
18 ~ConditionalWorkItemList() override; 18 ~ConditionalWorkItemList() override;
19 19
20 // If condition_->ShouldRun() returns true, then execute the items in this 20 // If condition_->ShouldRun() returns true, then execute the items in this
21 // list and return true iff they all succeed. If condition_->ShouldRun() 21 // list and return true iff they all succeed. If condition_->ShouldRun()
22 // returns false, does nothing and returns true. 22 // returns false, does nothing and returns true.
23 bool Do() override; 23 bool Do() override;
24 24
25 // Does a rollback of the items (if any) that were run in Do. 25 // Does a rollback of the items (if any) that were run in Do.
26 void Rollback() override; 26 void Rollback() override;
27 27
28 protected: 28 protected:
29 // Pointer to a Condition that is used to determine whether to run this 29 // Pointer to a Condition that is used to determine whether to run this
30 // WorkItemList. 30 // WorkItemList.
31 scoped_ptr<Condition> condition_; 31 std::unique_ptr<Condition> condition_;
32 }; 32 };
33 33
34 34
35 // Pre-defined conditions: 35 // Pre-defined conditions:
36 //------------------------------------------------------------------------------ 36 //------------------------------------------------------------------------------
37 class ConditionRunIfFileExists : public WorkItem::Condition { 37 class ConditionRunIfFileExists : public WorkItem::Condition {
38 public: 38 public:
39 explicit ConditionRunIfFileExists(const base::FilePath& key_path) 39 explicit ConditionRunIfFileExists(const base::FilePath& key_path)
40 : key_path_(key_path) {} 40 : key_path_(key_path) {}
41 bool ShouldRun() const override; 41 bool ShouldRun() const override;
42 42
43 private: 43 private:
44 base::FilePath key_path_; 44 base::FilePath key_path_;
45 }; 45 };
46 46
47 // Condition class that inverts the ShouldRun result of another Condition. 47 // Condition class that inverts the ShouldRun result of another Condition.
48 // This class assumes ownership of original_condition. 48 // This class assumes ownership of original_condition.
49 class Not : public WorkItem::Condition { 49 class Not : public WorkItem::Condition {
50 public: 50 public:
51 explicit Not(WorkItem::Condition* original_condition); 51 explicit Not(WorkItem::Condition* original_condition);
52 ~Not() override; 52 ~Not() override;
53 53
54 bool ShouldRun() const override; 54 bool ShouldRun() const override;
55 55
56 private: 56 private:
57 scoped_ptr<WorkItem::Condition> original_condition_; 57 std::unique_ptr<WorkItem::Condition> original_condition_;
58 }; 58 };
59 59
60 #endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_ 60 #endif // CHROME_INSTALLER_UTIL_CONDITIONAL_WORK_ITEM_LIST_H_
OLDNEW
« no previous file with comments | « chrome/installer/util/chromium_binaries_distribution.cc ('k') | chrome/installer/util/copy_tree_work_item_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698