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

Unified Diff: chrome/browser/value_store/value_store.h

Issue 16915006: Convert most of extensions and some other random stuff to using the base namespace for Values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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: chrome/browser/value_store/value_store.h
diff --git a/chrome/browser/value_store/value_store.h b/chrome/browser/value_store/value_store.h
index c57140f8614376b442a163e0eebd320a93087a1e..4a25786112c7cacdf360058613b2b780cfa8d016 100644
--- a/chrome/browser/value_store/value_store.h
+++ b/chrome/browser/value_store/value_store.h
@@ -19,7 +19,7 @@ class ValueStore {
class ReadResultType {
public:
// Ownership of |settings| taken.
- explicit ReadResultType(DictionaryValue* settings);
+ explicit ReadResultType(base::DictionaryValue* settings);
explicit ReadResultType(const std::string& error);
~ReadResultType();
@@ -27,7 +27,7 @@ class ValueStore {
// the root object. If you request the value for key "foo", that value will
// be in |settings.foo|.
// Must only be called if HasError() is false.
- scoped_ptr<DictionaryValue>& settings();
+ scoped_ptr<base::DictionaryValue>& settings();
// Gets whether the operation failed.
bool HasError() const;
@@ -37,7 +37,7 @@ class ValueStore {
const std::string& error() const;
private:
- scoped_ptr<DictionaryValue> settings_;
+ scoped_ptr<base::DictionaryValue> settings_;
const std::string error_;
DISALLOW_COPY_AND_ASSIGN(ReadResultType);
@@ -124,12 +124,13 @@ class ValueStore {
virtual ReadResult Get() = 0;
// Sets a single key to a new value.
- virtual WriteResult Set(
- WriteOptions options, const std::string& key, const Value& value) = 0;
+ virtual WriteResult Set(WriteOptions options,
+ const std::string& key,
+ const base::Value& value) = 0;
// Sets multiple keys to new values.
virtual WriteResult Set(
- WriteOptions options, const DictionaryValue& values) = 0;
+ WriteOptions options, const base::DictionaryValue& values) = 0;
// Removes a key from the storage.
virtual WriteResult Remove(const std::string& key) = 0;

Powered by Google App Engine
This is Rietveld 408576698