chrome/browser/ui/webui/settings/site_settings_handler.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_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/settings/site_settings_handler.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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/settings/settings_startup_pages_handler.cc ('k') | chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/site_settings_handler.cc

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

index 15d1e2a73fc28e72d734fa625cc34520aadcbe0e..60c6da20f99a5c0a81cff4dce585e9e84b79f445 100644

--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc

+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc

@@ -199,7 +199,7 @@ void SiteSettingsHandler::HandleGetExceptionList(const base::ListValue* args) {

HostContentSettingsMap* map =

HostContentSettingsMapFactory::GetForProfile(profile_);

- scoped_ptr<base::ListValue> exceptions(new base::ListValue);

+ std::unique_ptr<base::ListValue> exceptions(new base::ListValue);

site_settings::GetExceptionsFromHostContentSettingsMap(

map, content_type, web_ui(), exceptions.get());

ResolveJavascriptCallback(*callback_id, *exceptions.get());