diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 20:00:20 +0000 |
| commit | 93d49d70b89b22ec46d0b00b7950297f64865d56 (patch) | |
| tree | 3243e0209c738df0c18c2ba615667f757fcaec94 /chrome/common/json_value_serializer.cc | |
| parent | a9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff) | |
| download | chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2 | |
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific).
Move the files into the base namespace.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/316016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/json_value_serializer.cc')
| -rw-r--r-- | chrome/common/json_value_serializer.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/common/json_value_serializer.cc b/chrome/common/json_value_serializer.cc index 33f94ce..1e739e6 100644 --- a/chrome/common/json_value_serializer.cc +++ b/chrome/common/json_value_serializer.cc @@ -5,8 +5,8 @@ #include "chrome/common/json_value_serializer.h" #include "base/file_util.h" -#include "base/json_reader.h" -#include "base/json_writer.h" +#include "base/json/json_reader.h" +#include "base/json/json_writer.h" #include "base/string_util.h" JSONStringValueSerializer::~JSONStringValueSerializer() {} @@ -15,8 +15,7 @@ bool JSONStringValueSerializer::Serialize(const Value& root) { if (!json_string_ || initialized_with_const_string_) return false; - JSONWriter::Write(&root, pretty_print_, json_string_); - + base::JSONWriter::Write(&root, pretty_print_, json_string_); return true; } @@ -24,8 +23,9 @@ Value* JSONStringValueSerializer::Deserialize(std::string* error_message) { if (!json_string_) return NULL; - return JSONReader::ReadAndReturnError(*json_string_, allow_trailing_comma_, - error_message); + return base::JSONReader::ReadAndReturnError(*json_string_, + allow_trailing_comma_, + error_message); } /******* File Serializer *******/ |