diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 20:46:40 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 20:46:40 +0000 |
| commit | 6470ee8f59dba5eecfce4a64d7ff3930ae716095 (patch) | |
| tree | 86e020619f32c56f5796a0ea20975c71607ac91f /base/json_writer.cc | |
| parent | 409993dec55a874e0659acf421a87070d450a262 (diff) | |
| download | chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.zip chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.tar.gz chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.tar.bz2 | |
Revert dsh's change 10818
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_writer.cc')
| -rw-r--r-- | base/json_writer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/json_writer.cc b/base/json_writer.cc index 56efce9..20c533b 100644 --- a/base/json_writer.cc +++ b/base/json_writer.cc @@ -76,7 +76,7 @@ void JSONWriter::BuildJSONString(const Value* const node, int depth) { std::wstring value; bool result = node->GetAsString(&value); DCHECK(result); - AppendQuotedString(WideToUTF16Hack(value)); + AppendQuotedString(value); break; } @@ -155,8 +155,8 @@ void JSONWriter::BuildJSONString(const Value* const node, int depth) { } } -void JSONWriter::AppendQuotedString(const string16& str) { - string_escape::JavascriptDoubleQuote(str, true, +void JSONWriter::AppendQuotedString(const std::wstring& str) { + string_escape::JavascriptDoubleQuote(WideToUTF16Hack(str), true, json_string_); } |