summaryrefslogtreecommitdiffstats
path: root/chrome/common/json_value_serializer.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-29 00:21:49 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-29 00:21:49 +0000
commit94d126b3ce7e1f3100897240884a00f3b7e96575 (patch)
tree51306cea1e41d88f10ef3554f89c2208f5512583 /chrome/common/json_value_serializer.cc
parentad89a6dc97029138b9f7f04135f3e8e164491eb5 (diff)
downloadchromium_src-94d126b3ce7e1f3100897240884a00f3b7e96575.zip
chromium_src-94d126b3ce7e1f3100897240884a00f3b7e96575.tar.gz
chromium_src-94d126b3ce7e1f3100897240884a00f3b7e96575.tar.bz2
Update the JSONValueSerializer to have a flag to allow trailing commas. By default, we don't support this when deserializing JSON, but the user can enable this.
BUG=1295713 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/json_value_serializer.cc')
-rw-r--r--chrome/common/json_value_serializer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/json_value_serializer.cc b/chrome/common/json_value_serializer.cc
index 0049fc6..02b727f 100644
--- a/chrome/common/json_value_serializer.cc
+++ b/chrome/common/json_value_serializer.cc
@@ -49,7 +49,7 @@ bool JSONStringValueSerializer::Deserialize(Value** root) {
if (!json_string_)
return false;
- return JSONReader::Read(*json_string_, root);
+ return JSONReader::Read(*json_string_, root, allow_trailing_comma_);
}
/******* File Serializer *******/