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

Unified Diff: chrome/browser/prefs/pref_value_map.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« no previous file with comments | « chrome/browser/prefs/pref_service.h ('k') | chrome/browser/prefs/proxy_config_dictionary.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_value_map.h
===================================================================
--- chrome/browser/prefs/pref_value_map.h (revision 92173)
+++ chrome/browser/prefs/pref_value_map.h (working copy)
@@ -12,13 +12,15 @@
#include "base/basictypes.h"
+namespace base {
class Value;
+}
// A generic string to value map used by the PrefStore implementations.
class PrefValueMap {
public:
- typedef std::map<std::string, Value*>::iterator iterator;
- typedef std::map<std::string, Value*>::const_iterator const_iterator;
+ typedef std::map<std::string, base::Value*>::iterator iterator;
+ typedef std::map<std::string, base::Value*>::const_iterator const_iterator;
PrefValueMap();
virtual ~PrefValueMap();
@@ -26,12 +28,12 @@
// Gets the value for |key| and stores it in |value|. Ownership remains with
// the map. Returns true if a value is present. If not, |value| is not
// touched.
- bool GetValue(const std::string& key, const Value** value) const;
- bool GetValue(const std::string& key, Value** value);
+ bool GetValue(const std::string& key, const base::Value** value) const;
+ bool GetValue(const std::string& key, base::Value** value);
// Sets a new |value| for |key|. Takes ownership of |value|, which must be
// non-NULL. Returns true if the value changed.
- bool SetValue(const std::string& key, Value* value);
+ bool SetValue(const std::string& key, base::Value* value);
// Removes the value for |key| from the map. Returns true if a value was
// removed.
@@ -63,7 +65,7 @@
std::vector<std::string>* differing_keys) const;
private:
- typedef std::map<std::string, Value*> Map;
+ typedef std::map<std::string, base::Value*> Map;
Map prefs_;
« no previous file with comments | « chrome/browser/prefs/pref_service.h ('k') | chrome/browser/prefs/proxy_config_dictionary.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698