chrome/browser/ui/webui/options2/core_options_handler2.cc - Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

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/options2/core_options_handler2.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 8 years, 8 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:

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

Download patch

« base/json/json_reader.h ('K') | « chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/core_options_handler2.cc

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

index 226756b116d71471e2b5a503b0fe5d84c40db1de..d25a3f1193ab4f6e34f69cd15dbff00573139d50 100644

--- a/chrome/browser/ui/webui/options2/core_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/core_options_handler2.cc

@@ -416,9 +416,7 @@ void CoreOptionsHandler::HandleSetPref(const ListValue* args, PrefType type) {

std::string json_string;

CHECK(value->GetAsString(&json_string));

temp_value.reset(

- base::JSONReader().JsonToValue(json_string,

- false, // no check_root

- false)); // no trailing comma

+ base::JSONReader::Read(json_string));

value = temp_value.get();

CHECK_EQ(base::Value::TYPE_LIST, value->GetType());

break;