| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "third_party/libaddressinput/src/cpp/src/util/json.h" | 5 #include "third_party/libaddressinput/src/cpp/src/util/json.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 // |json| is converted to a |c_str()| here because rapidjson and other parts | 29 // |json| is converted to a |c_str()| here because rapidjson and other parts |
| 30 // of the standalone library use char* rather than std::string. | 30 // of the standalone library use char* rather than std::string. |
| 31 ::scoped_ptr<const base::Value> parsed(base::JSONReader::Read(json.c_str())); | 31 ::scoped_ptr<const base::Value> parsed(base::JSONReader::Read(json.c_str())); |
| 32 *parser_error = !parsed || !parsed->IsType(base::Value::TYPE_DICTIONARY); | 32 *parser_error = !parsed || !parsed->IsType(base::Value::TYPE_DICTIONARY); |
| 33 | 33 |
| 34 if (*parser_error) | 34 if (*parser_error) |
| 35 result.reset(new base::DictionaryValue); | 35 result.reset(new base::DictionaryValue); |
| 36 else | 36 else |
| 37 result.reset(static_cast<const base::DictionaryValue*>(parsed.release())); | 37 result.reset(static_cast<const base::DictionaryValue*>(parsed.release())); |
| 38 | 38 |
| 39 return result.Pass(); | 39 return std::move(result); |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace | 42 } // namespace |
| 43 | 43 |
| 44 // Implementation of JSON parser for libaddressinput using JSON parser in | 44 // Implementation of JSON parser for libaddressinput using JSON parser in |
| 45 // Chrome. | 45 // Chrome. |
| 46 class Json::JsonImpl { | 46 class Json::JsonImpl { |
| 47 public: | 47 public: |
| 48 explicit JsonImpl(const std::string& json) | 48 explicit JsonImpl(const std::string& json) |
| 49 : owned_(Parse(json, &parser_error_)), | 49 : owned_(Parse(json, &parser_error_)), |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 101 |
| 102 bool Json::GetStringValueForKey(const std::string& key, | 102 bool Json::GetStringValueForKey(const std::string& key, |
| 103 std::string* value) const { | 103 std::string* value) const { |
| 104 return impl_->GetStringValueForKey(key, value); | 104 return impl_->GetStringValueForKey(key, value); |
| 105 } | 105 } |
| 106 | 106 |
| 107 Json::Json(JsonImpl* impl) : impl_(impl) {} | 107 Json::Json(JsonImpl* impl) : impl_(impl) {} |
| 108 | 108 |
| 109 } // namespace addressinput | 109 } // namespace addressinput |
| 110 } // namespace i18n | 110 } // namespace i18n |
| OLD | NEW |