diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 20:47:52 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 20:47:52 +0000 |
| commit | 4dad9ad838f6671fbd67e1c5292525e739e31983 (patch) | |
| tree | 4d79fc17f12752cc221e0e40d16951677da71f92 /base/json/json_reader.cc | |
| parent | 2b3f0f59a6761a41e22007c2c3096e8e18517e08 (diff) | |
| download | chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.zip chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.tar.gz chromium_src-4dad9ad838f6671fbd67e1c5292525e739e31983.tar.bz2 | |
Many changes to DictionaryValues:
* Add support for keys with "." in them via new XXXWithoutPathExpansion() APIs.
* Use these APIs with all key iterator usage.
* SetXXX() calls cannot fail, so change them from bool to void.
* Change GetSize() to size() since it's cheap, and add empty().
Other:
* Use standard for loop format in more places (e.g. instead of while loops when they're really doing a for loop).
* Shorten a few bits of code.
BUG=567
TEST=none
Review URL: http://codereview.chromium.org/441008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json/json_reader.cc')
| -rw-r--r-- | base/json/json_reader.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc index 06d790c..bdc682b 100644 --- a/base/json/json_reader.cc +++ b/base/json/json_reader.cc @@ -281,7 +281,8 @@ Value* JSONReader::BuildValue(bool is_root) { Value* dict_value = BuildValue(false); if (!dict_value) return NULL; - static_cast<DictionaryValue*>(node.get())->Set(dict_key, dict_value); + static_cast<DictionaryValue*>(node.get())->SetWithoutPathExpansion( + dict_key, dict_value); // After a key/value pair, we expect a comma or the end of the // object. |