diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 11:52:22 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 11:52:22 +0000 |
| commit | 11b366da9588a954343196434e00822aa3cf9b93 (patch) | |
| tree | 0c8d3d6b521be4308c4f979ad19e1526ca65bc8e /jingle | |
| parent | 3fa8fe590f29d504ce1284d5b4814c64861b4ab7 (diff) | |
| download | chromium_src-11b366da9588a954343196434e00822aa3cf9b93.zip chromium_src-11b366da9588a954343196434e00822aa3cf9b93.tar.gz chromium_src-11b366da9588a954343196434e00822aa3cf9b93.tar.bz2 | |
Revert of https://codereview.chromium.org/100823007/
Reason for revert: This patchset breaks at least displayment of Russian localized strings on Chromeos login screen.
TBR=mark@chromium.org,jshin@chromium.org,thakis@chromium.org,asanka@chromium.org,zea@chromium.org,bauerb@chromium.org,rsesek@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/106793004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/listener/notification_defines.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/jingle/notifier/listener/notification_defines.cc b/jingle/notifier/listener/notification_defines.cc index f7c8f8f..f4f3e40 100644 --- a/jingle/notifier/listener/notification_defines.cc +++ b/jingle/notifier/listener/notification_defines.cc @@ -65,12 +65,10 @@ bool Notification::Equals(const Notification& other) const { } std::string Notification::ToString() const { - // |channel| or |data| could hold binary data, so convert all non-ASCII - // characters to escape sequences. - const std::string& printable_channel = - base::EscapeBytesAsInvalidJSONString(channel, true /* put_in_quotes */); - const std::string& printable_data = - base::EscapeBytesAsInvalidJSONString(data, true /* put_in_quotes */); + // |channel| or |data| could hold binary data, so use GetDoubleQuotedJson() + // to escape them. + const std::string& printable_channel = base::GetDoubleQuotedJson(channel); + const std::string& printable_data = base::GetDoubleQuotedJson(data); return "{ channel: " + printable_channel + ", data: " + printable_data + " }"; } |