chromeos/app_mode/kiosk_oem_manifest_parser.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

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: chromeos/app_mode/kiosk_oem_manifest_parser.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add todo about not failed trybot Created 5 years, 2 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

Index: chromeos/app_mode/kiosk_oem_manifest_parser.cc

diff --git a/chromeos/app_mode/kiosk_oem_manifest_parser.cc b/chromeos/app_mode/kiosk_oem_manifest_parser.cc

index f13d1a8fd9cdd21e946ea8ac93ea6c52d7f05521..16c072ab9c7b1e1c35f3145bd7af27eefb97f940 100644

--- a/chromeos/app_mode/kiosk_oem_manifest_parser.cc

+++ b/chromeos/app_mode/kiosk_oem_manifest_parser.cc

@@ -32,8 +32,8 @@ bool KioskOemManifestParser::Load(

std::string error_msg;

scoped_ptr<JSONFileValueDeserializer> deserializer(

new JSONFileValueDeserializer(kiosk_oem_file));

- scoped_ptr<base::Value> value(

- deserializer->Deserialize(&error_code, &error_msg));

+ scoped_ptr<base::Value> value =

+ deserializer->Deserialize(&error_code, &error_msg);

base::DictionaryValue* dict = NULL;

if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||

!value.get() ||

« no previous file with comments | « chromecast/base/serializers.cc ('k') | chromeos/dbus/fake_easy_unlock_client.cc » ('j') | no next file with comments »