chrome/browser/ui/webui/nacl_ui.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: chrome/browser/ui/webui/nacl_ui.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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm ('k') | chrome/common/component_flash_hint_file_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e129cfd561584f182f98b996af3d2617ba7bc529..3ee8381bbd563c83f99649b26eb93c29dae5b936 100644

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

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

@@ -328,7 +328,7 @@ void CheckVersion(const base::FilePath& pnacl_path, std::string* version) {

pnacl_path.AppendASCII("pnacl_public_pnacl_json");

JSONFileValueDeserializer deserializer(pnacl_json_path);

std::string error;

- scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, &error));

+ scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, &error);

if (!root || !root->IsType(base::Value::TYPE_DICTIONARY))

return;