diff options
author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
---|---|---|
committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
commit | 8e50b600ed1e65789109022709cf5c349748fb4c (patch) | |
tree | d9d57344003604647e1a96a56ef4d21921ec44c0 /base/json_writer.cc | |
parent | 0c8a8f7aa683ae7d6c8ba176c1db704cc294defb (diff) | |
download | chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.zip chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.gz chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.bz2 |
revert broken change 10833
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 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_); } |