summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_about_handler.cc
diff options
context:
space:
mode:
authorericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 02:50:48 +0000
committerericdingle@chromium.org <ericdingle@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 02:50:48 +0000
commit5f4b64f3dbc358de9b561d4874bf37a2f11bf41b (patch)
tree85eb30d3066c804f63a1267d575bc62a93bbf34e /chrome/browser/browser_about_handler.cc
parent16d57d911df1ea8af40c429eaa9c634f9b51c75d (diff)
downloadchromium_src-5f4b64f3dbc358de9b561d4874bf37a2f11bf41b.zip
chromium_src-5f4b64f3dbc358de9b561d4874bf37a2f11bf41b.tar.gz
chromium_src-5f4b64f3dbc358de9b561d4874bf37a2f11bf41b.tar.bz2
Allow JSONWriter and JSONValueSerializer to ignore binary values when instructed to do so.
Design discussion is available here: http://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/967eb64325c24f9c BUG=None TEST=base_unittests Review URL: http://codereview.chromium.org/8505033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r--chrome/browser/browser_about_handler.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index bc76afc..d093b8f 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -1006,7 +1006,8 @@ std::string AboutStats(const std::string& query) {
std::string data;
if (query == "json" || query == kStringsJsPath) {
- base::JSONWriter::WriteWithOptionalEscape(&root, true, false, &data);
+ base::JSONWriter::WriteWithOptions(
+ &root, true, base::JSONWriter::OPTIONS_DO_NOT_ESCAPE, &data);
if (query == kStringsJsPath)
data = "var templateData = " + data + ";";
} else if (query == "raw") {