chrome/browser/policy/configuration_policy_handler_chromeos.cc - Issue 9590002: JSONWriter cleanup: integrate pretty print into write options.

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/policy/configuration_policy_handler_chromeos.cc

Issue 9590002: JSONWriter cleanup: integrate pretty print into write options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict 7. Created 8 years, 9 months ago

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

Jump to:

Index: chrome/browser/policy/configuration_policy_handler_chromeos.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/policy/configuration_policy_handler_chromeos.cc

index 2941ddc9900a6b7e5b34456f5bbb2db61c8383ee..ff43551ea6fd37cf4e57e1a59874aacca7c86a7f 100644

--- a/chrome/browser/policy/configuration_policy_handler_chromeos.cc

+++ b/chrome/browser/policy/configuration_policy_handler_chromeos.cc

@@ -95,8 +95,9 @@ Value* NetworkConfigurationPolicyHandler::SanitizeNetworkConfig(

}

// Convert back to a string, pretty printing the contents.

- base::JSONWriter::WriteWithOptions(config_dict, true,

- base::JSONWriter::OPTIONS_DO_NOT_ESCAPE,

+ base::JSONWriter::WriteWithOptions(config_dict,

+ base::JSONWriter::OPTIONS_DO_NOT_ESCAPE |

+ base::JSONWriter::OPTIONS_PRETTY_PRINT,

&json_string);

return Value::CreateStringValue(json_string);

}