chrome/browser/ui/webui/about_ui.cc - Issue 106793004: Revert of Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/about_ui.cc

Issue 106793004: Revert of Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/about_ui.cc

diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc

index 4a779f69307d15444aee9248ecd4ce50b1eca300..3cd6806258ff1ce623e39eb8ae6e969799d601bf 100644

--- a/chrome/browser/ui/webui/about_ui.cc

+++ b/chrome/browser/ui/webui/about_ui.cc

@@ -708,7 +708,8 @@

if (query == "json" || query == kStringsJsPath) {

base::JSONWriter::WriteWithOptions(

&root,

- base::JSONWriter::OPTIONS_PRETTY_PRINT,

+ base::JSONWriter::OPTIONS_DO_NOT_ESCAPE |

+ base::JSONWriter::OPTIONS_PRETTY_PRINT,

&data);

if (query == kStringsJsPath)

data = "var templateData = " + data + ";";

« no previous file with comments | « chrome/browser/spellchecker/spelling_service_client.cc ('k') | chrome/browser/ui/webui/policy_ui.cc » ('j') | no next file with comments »