chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc - Issue 1871713002: Convert //chrome/browser/extensions 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/extensions/api/settings_overrides/settings_overrides_api.cc

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

Patch Set: Rebase and fix header 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/extensions/api/settings_overrides/settings_overrides_api.h ('k') | chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

index 1fe79985689888a58fe3f3e6d0c0e3c740b962a7..23dc6d7d349ac33e0308937a3030c24ecbc79056 100644

--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

@@ -188,7 +188,7 @@ void SettingsOverridesAPI::OnExtensionLoaded(

kManyStartupPagesWarning,

manifest_keys::kSettingsOverride);

}

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

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

url_list->Append(new base::StringValue(SubstituteInstallParam(

settings->startup_pages[0].spec(), install_parameter)));

SetPref(

@@ -267,7 +267,7 @@ void SettingsOverridesAPI::RegisterSearchProvider(

const SettingsOverrides* settings = SettingsOverrides::Get(extension);

DCHECK(settings);

DCHECK(settings->search_engine);

- scoped_ptr<TemplateURL::AssociatedExtensionInfo> info(

+ std::unique_ptr<TemplateURL::AssociatedExtensionInfo> info(

new TemplateURL::AssociatedExtensionInfo(

TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, extension->id()));

info->wants_to_be_default_engine = settings->search_engine->is_default;