chrome/browser/ui/webui/options/core_options_handler.cc - Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions

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/options/core_options_handler.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix bad merge Created 5 years, 7 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: chrome/browser/ui/webui/options/core_options_handler.cc

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

index 3ffe03457755544d452756992f37281e0a7e48b8..f1ca93addfd9e9ec42fe3ff68caa9a2ab9a19bc0 100644

--- a/chrome/browser/ui/webui/options/core_options_handler.cc

+++ b/chrome/browser/ui/webui/options/core_options_handler.cc

@@ -369,7 +369,7 @@ base::Value* CoreOptionsHandler::CreateValueForPref(

pref_service->FindPreference(pref_name.c_str());

if (!pref) {

NOTREACHED();

- return base::Value::CreateNullValue();

+ return base::Value::CreateNullValue().release();

}

const PrefService::Preference* controlling_pref =

pref_service->FindPreference(controlling_pref_name.c_str());

« no previous file with comments | « chrome/browser/ui/webui/options/cookies_view_handler.cc ('k') | chrome/test/chromedriver/chrome/web_view_impl.cc » ('j') | no next file with comments »