OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/json/json_string_value_serializer.h" | 5 #include "base/json/json_string_value_serializer.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 | 10 |
(...skipping 25 matching lines...) Expand all Loading... |
36 std::string* error_str) { | 36 std::string* error_str) { |
37 if (!json_string_) | 37 if (!json_string_) |
38 return NULL; | 38 return NULL; |
39 | 39 |
40 return base::JSONReader::ReadAndReturnError(*json_string_, | 40 return base::JSONReader::ReadAndReturnError(*json_string_, |
41 allow_trailing_comma_, | 41 allow_trailing_comma_, |
42 error_code, | 42 error_code, |
43 error_str); | 43 error_str); |
44 } | 44 } |
45 | 45 |
OLD | NEW |