chrome/browser/ui/webui/options/chromeos/core_chromeos_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/chromeos/core_chromeos_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

« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

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

index 86eee8a50aa1ead32cb48985e47cbb4d5b900954..815fa789ada0bd408a9cf68ca0b911f3d5b08416 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -174,7 +174,7 @@ base::Value* CoreChromeOSOptionsHandler::FetchPref(

proxy_cros_settings_parser::GetProxyPrefValue(

proxy_config_service_, pref_name, &value);

if (!value)

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

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

return value;

}

@@ -202,7 +202,7 @@ base::Value* CoreChromeOSOptionsHandler::FetchPref(

const base::Value* pref_value = CrosSettings::Get()->GetPref(pref_name);

if (!pref_value)

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

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

// Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.

// TODO(estade): seems that this should replicate CreateValueForPref less.