chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.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/declarative_content/default_content_predicate_evaluators.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/declarative_content/default_content_predicate_evaluators.h ('k') | chrome/browser/extensions/api/declarative_content/request_content_script_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.cc

diff --git a/chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.cc b/chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.cc

index cce04f673ce9cbd3dda8a867b1e43ef318836067..256505926f37f205b030d6c4e223fb770391735f 100644

--- a/chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.cc

+++ b/chrome/browser/extensions/api/declarative_content/default_content_predicate_evaluators.cc

@@ -10,16 +10,16 @@

namespace extensions {

-std::vector<scoped_ptr<ContentPredicateEvaluator>>

+std::vector<std::unique_ptr<ContentPredicateEvaluator>>

CreateDefaultContentPredicateEvaluators(

content::BrowserContext* browser_context,

ContentPredicateEvaluator::Delegate* delegate) {

- std::vector<scoped_ptr<ContentPredicateEvaluator>> evaluators;

- evaluators.push_back(scoped_ptr<ContentPredicateEvaluator>(

+ std::vector<std::unique_ptr<ContentPredicateEvaluator>> evaluators;

+ evaluators.push_back(std::unique_ptr<ContentPredicateEvaluator>(

new DeclarativeContentPageUrlConditionTracker(delegate)));

- evaluators.push_back(scoped_ptr<ContentPredicateEvaluator>(

+ evaluators.push_back(std::unique_ptr<ContentPredicateEvaluator>(

new DeclarativeContentCssConditionTracker(delegate)));

- evaluators.push_back(scoped_ptr<ContentPredicateEvaluator>(

+ evaluators.push_back(std::unique_ptr<ContentPredicateEvaluator>(

new DeclarativeContentIsBookmarkedConditionTracker(browser_context,

delegate)));

return evaluators;