Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: extensions/common/event_filter.h

Issue 1908953003: Convert //extensions/{common,shell} 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 | « extensions/common/cast/cast_cert_validator_unittest.cc ('k') | extensions/common/event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/event_filter.h
diff --git a/extensions/common/event_filter.h b/extensions/common/event_filter.h
index 8f6d60404200629f7d4cf9f6e837ca63737ee720..567c1d0867651121c8e051d56cb4d8f661567207 100644
--- a/extensions/common/event_filter.h
+++ b/extensions/common/event_filter.h
@@ -28,7 +28,7 @@ class EventFilter {
// Adds an event matcher that will be used in calls to MatchEvent(). Returns
// the id of the matcher, or -1 if there was an error.
MatcherID AddEventMatcher(const std::string& event_name,
- scoped_ptr<EventMatcher> matcher);
+ std::unique_ptr<EventMatcher> matcher);
// Retrieve the EventMatcher with the given id.
EventMatcher* GetEventMatcher(MatcherID id);
@@ -63,7 +63,7 @@ class EventFilter {
// URLMatcherConditionSets that match the URL constraints specified by
// |event_matcher|.
EventMatcherEntry(
- scoped_ptr<EventMatcher> event_matcher,
+ std::unique_ptr<EventMatcher> event_matcher,
url_matcher::URLMatcher* url_matcher,
const url_matcher::URLMatcherConditionSet::Vector& condition_sets);
~EventMatcherEntry();
@@ -79,7 +79,7 @@ class EventFilter {
}
private:
- scoped_ptr<EventMatcher> event_matcher_;
+ std::unique_ptr<EventMatcher> event_matcher_;
// The id sets in url_matcher_ that this EventMatcher owns.
std::vector<url_matcher::URLMatcherConditionSet::ID> condition_set_ids_;
url_matcher::URLMatcher* url_matcher_;
« no previous file with comments | « extensions/common/cast/cast_cert_validator_unittest.cc ('k') | extensions/common/event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698