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

Side by Side Diff: components/prefs/pref_value_map.h

Issue 1907043002: Convert //components/prefs from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixes 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 COMPONENTS_PREFS_PREF_VALUE_MAP_H_ 5 #ifndef COMPONENTS_PREFS_PREF_VALUE_MAP_H_
6 #define COMPONENTS_PREFS_PREF_VALUE_MAP_H_ 6 #define COMPONENTS_PREFS_PREF_VALUE_MAP_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/containers/scoped_ptr_hash_map.h" 12 #include "base/containers/scoped_ptr_hash_map.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "components/prefs/base_prefs_export.h" 14 #include "components/prefs/base_prefs_export.h"
15 15
16 namespace base { 16 namespace base {
17 class Value; 17 class Value;
18 } 18 }
19 19
20 // A generic string to value map used by the PrefStore implementations. 20 // A generic string to value map used by the PrefStore implementations.
21 class COMPONENTS_PREFS_EXPORT PrefValueMap { 21 class COMPONENTS_PREFS_EXPORT PrefValueMap {
22 public: 22 public:
23 using Map = base::ScopedPtrHashMap<std::string, scoped_ptr<base::Value>>; 23 using Map = base::ScopedPtrHashMap<std::string, std::unique_ptr<base::Value>>;
24 using iterator = Map::iterator; 24 using iterator = Map::iterator;
25 using const_iterator = Map::const_iterator; 25 using const_iterator = Map::const_iterator;
26 26
27 PrefValueMap(); 27 PrefValueMap();
28 virtual ~PrefValueMap(); 28 virtual ~PrefValueMap();
29 29
30 // Gets the value for |key| and stores it in |value|. Ownership remains with 30 // Gets the value for |key| and stores it in |value|. Ownership remains with
31 // the map. Returns true if a value is present. If not, |value| is not 31 // the map. Returns true if a value is present. If not, |value| is not
32 // touched. 32 // touched.
33 bool GetValue(const std::string& key, const base::Value** value) const; 33 bool GetValue(const std::string& key, const base::Value** value) const;
34 bool GetValue(const std::string& key, base::Value** value); 34 bool GetValue(const std::string& key, base::Value** value);
35 35
36 // Sets a new |value| for |key|. |value| must be non-null. Returns true if the 36 // Sets a new |value| for |key|. |value| must be non-null. Returns true if the
37 // value changed. 37 // value changed.
38 bool SetValue(const std::string& key, scoped_ptr<base::Value> value); 38 bool SetValue(const std::string& key, std::unique_ptr<base::Value> value);
39 39
40 // Removes the value for |key| from the map. Returns true if a value was 40 // Removes the value for |key| from the map. Returns true if a value was
41 // removed. 41 // removed.
42 bool RemoveValue(const std::string& key); 42 bool RemoveValue(const std::string& key);
43 43
44 // Clears the map. 44 // Clears the map.
45 void Clear(); 45 void Clear();
46 46
47 // Swaps the contents of two maps. 47 // Swaps the contents of two maps.
48 void Swap(PrefValueMap* other); 48 void Swap(PrefValueMap* other);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 void GetDifferingKeys(const PrefValueMap* other, 82 void GetDifferingKeys(const PrefValueMap* other,
83 std::vector<std::string>* differing_keys) const; 83 std::vector<std::string>* differing_keys) const;
84 84
85 private: 85 private:
86 Map prefs_; 86 Map prefs_;
87 87
88 DISALLOW_COPY_AND_ASSIGN(PrefValueMap); 88 DISALLOW_COPY_AND_ASSIGN(PrefValueMap);
89 }; 89 };
90 90
91 #endif // COMPONENTS_PREFS_PREF_VALUE_MAP_H_ 91 #endif // COMPONENTS_PREFS_PREF_VALUE_MAP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698