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

Unified Diff: base/prefs/pref_value_map.h

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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: base/prefs/pref_value_map.h
diff --git a/base/prefs/pref_value_map.h b/base/prefs/pref_value_map.h
index 2db18ab2a187144ee834388afe550702c5d8c9b4..12b30c6973948a54260dce8c0f04db9bd0ad1e7e 100644
--- a/base/prefs/pref_value_map.h
+++ b/base/prefs/pref_value_map.h
@@ -5,11 +5,11 @@
#ifndef BASE_PREFS_PREF_VALUE_MAP_H_
#define BASE_PREFS_PREF_VALUE_MAP_H_
-#include <map>
#include <string>
#include <vector>
#include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
#include "base/prefs/base_prefs_export.h"
namespace base {
@@ -19,8 +19,9 @@ class Value;
// A generic string to value map used by the PrefStore implementations.
class BASE_PREFS_EXPORT PrefValueMap {
public:
- typedef std::map<std::string, base::Value*>::iterator iterator;
- typedef std::map<std::string, base::Value*>::const_iterator const_iterator;
+ using Map = base::hash_map<std::string, base::Value*>;
+ using iterator = Map::iterator;
+ using const_iterator = Map::const_iterator;
PrefValueMap();
virtual ~PrefValueMap();
@@ -81,8 +82,6 @@ class BASE_PREFS_EXPORT PrefValueMap {
std::vector<std::string>* differing_keys) const;
private:
- typedef std::map<std::string, base::Value*> Map;
-
Map prefs_;
DISALLOW_COPY_AND_ASSIGN(PrefValueMap);

Powered by Google App Engine
This is Rietveld 408576698