summaryrefslogtreecommitdiffstats
path: root/base/json/json_reader.cc
diff options
context:
space:
mode:
Diffstat (limited to 'base/json/json_reader.cc')
-rw-r--r--base/json/json_reader.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc
index c9f6e76..3457478 100644
--- a/base/json/json_reader.cc
+++ b/base/json/json_reader.cc
@@ -93,18 +93,24 @@ JSONReader::JSONReader()
error_col_(0) {}
// static
+Value* JSONReader::Read(const std::string& json) {
+ return Read(json, JSON_PARSE_RFC);
+}
+
+// static
Value* JSONReader::Read(const std::string& json,
- bool allow_trailing_comma) {
- return ReadAndReturnError(json, allow_trailing_comma, NULL, NULL);
+ int options) {
+ return ReadAndReturnError(json, options, NULL, NULL);
}
// static
Value* JSONReader::ReadAndReturnError(const std::string& json,
- bool allow_trailing_comma,
+ int options,
int* error_code_out,
std::string* error_msg_out) {
JSONReader reader = JSONReader();
- Value* root = reader.JsonToValue(json, true, allow_trailing_comma);
+ Value* root = reader.JsonToValue(json, false,
+ (options & JSON_ALLOW_TRAILING_COMMAS) != 0);
if (root)
return root;