chrome/common/pref_service.cc - Issue 13169: Add error messages to JSONReader and friends. This required a bit of refactor...

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/common/pref_service.cc

Issue 13169: Add error messages to JSONReader and friends. This required a bit of refactor... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 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/common/pref_service.cc

===================================================================

--- chrome/common/pref_service.cc (revision 6390)

+++ chrome/common/pref_service.cc (working copy)

@@ -137,7 +137,7 @@

JSONFileValueSerializer serializer(file_path);

Value* root = NULL;

- if (serializer.Deserialize(&root)) {

+ if (serializer.Deserialize(&root, NULL)) {

// Preferences should always have a dictionary root.

if (!root->IsType(Value::TYPE_DICTIONARY)) {

delete root;

@@ -156,7 +156,7 @@

JSONFileValueSerializer serializer(pref_filename_);

Value* root;

- if (serializer.Deserialize(&root)) {

+ if (serializer.Deserialize(&root, NULL)) {

// Preferences should always have a dictionary root.

if (!root->IsType(Value::TYPE_DICTIONARY)) {

delete root;

« base/json_reader.h ('K') | « chrome/common/json_value_serializer_unittest.cc ('k') | chrome/common/pref_service_unittest.cc » ('j') | no next file with comments »