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

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

Issue 2602553003: Remove base::ScopedPtrHashMap from components/prefs/. (Closed)
Patch Set: fix Created 3 years, 12 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 <memory>
9 #include <string> 9 #include <string>
10 #include <unordered_map>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/containers/scoped_ptr_hash_map.h"
13 #include "base/macros.h" 13 #include "base/macros.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, std::unique_ptr<base::Value>>; 23 using Map = std::unordered_map<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;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void GetDifferingKeys(const PrefValueMap* other, 83 void GetDifferingKeys(const PrefValueMap* other,
84 std::vector<std::string>* differing_keys) const; 84 std::vector<std::string>* differing_keys) const;
85 85
86 private: 86 private:
87 Map prefs_; 87 Map prefs_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(PrefValueMap); 89 DISALLOW_COPY_AND_ASSIGN(PrefValueMap);
90 }; 90 };
91 91
92 #endif // COMPONENTS_PREFS_PREF_VALUE_MAP_H_ 92 #endif // COMPONENTS_PREFS_PREF_VALUE_MAP_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/profile_pref_store_manager_unittest.cc ('k') | components/prefs/pref_value_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698