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

Unified Diff: base/json/json_string_value_serializer.h

Issue 16797003: Make base use the proper Value namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwarnings fixed 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: base/json/json_string_value_serializer.h
diff --git a/base/json/json_string_value_serializer.h b/base/json/json_string_value_serializer.h
index 71bd1523c9818baa4846c6136ec7c49911d2cba6..8aa3f95bee50114332aa1152fd17616bab29eb2e 100644
--- a/base/json/json_string_value_serializer.h
+++ b/base/json/json_string_value_serializer.h
@@ -38,11 +38,11 @@ class BASE_EXPORT JSONStringValueSerializer : public base::ValueSerializer {
// Attempt to serialize the data structure represented by Value into
// JSON. If the return value is true, the result will have been written
// into the string passed into the constructor.
- virtual bool Serialize(const Value& root) OVERRIDE;
+ virtual bool Serialize(const base::Value& root) OVERRIDE;
// Equivalent to Serialize(root) except binary values are omitted from the
// output.
- bool SerializeAndOmitBinaryValues(const Value& root);
+ bool SerializeAndOmitBinaryValues(const base::Value& root);
// Attempt to deserialize the data structure encoded in the string passed
// in to the constructor into a structure of Value objects. If the return
@@ -51,8 +51,8 @@ class BASE_EXPORT JSONStringValueSerializer : public base::ValueSerializer {
// If |error_message| is non-null, it will be filled in with a formatted
// error message including the location of the error if appropriate.
// The caller takes ownership of the returned value.
- virtual Value* Deserialize(int* error_code,
- std::string* error_message) OVERRIDE;
+ virtual base::Value* Deserialize(int* error_code,
+ std::string* error_message) OVERRIDE;
void set_pretty_print(bool new_value) { pretty_print_ = new_value; }
bool pretty_print() { return pretty_print_; }
@@ -62,7 +62,7 @@ class BASE_EXPORT JSONStringValueSerializer : public base::ValueSerializer {
}
private:
- bool SerializeInternal(const Value& root, bool omit_binary_values);
+ bool SerializeInternal(const base::Value& root, bool omit_binary_values);
std::string* json_string_;
bool initialized_with_const_string_;

Powered by Google App Engine
This is Rietveld 408576698