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

Unified Diff: extensions/common/event_matcher.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/event_filtering_info.cc ('k') | extensions/common/event_matcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/event_matcher.h
diff --git a/extensions/common/event_matcher.h b/extensions/common/event_matcher.h
index 3bffd241a5478cd80f3ef12f7b91e77f474ff708..e7753985e439828d38caeb2658353d785d1b965f 100644
--- a/extensions/common/event_matcher.h
+++ b/extensions/common/event_matcher.h
@@ -5,8 +5,9 @@
#ifndef EXTENSIONS_COMMON_EVENT_MATCHER_H_
#define EXTENSIONS_COMMON_EVENT_MATCHER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
namespace extensions {
@@ -21,8 +22,7 @@ extern const char kEventFilterServiceTypeKey[];
// MatchNonURLCriteria() - URL matching is handled by EventFilter.
class EventMatcher {
public:
- EventMatcher(scoped_ptr<base::DictionaryValue> filter,
- int routing_id);
+ EventMatcher(std::unique_ptr<base::DictionaryValue> filter, int routing_id);
~EventMatcher();
// Returns true if |event_info| satisfies this matcher's criteria, not taking
@@ -55,7 +55,7 @@ class EventMatcher {
// {url: [{hostSuffix: 'google.com'}]}
//
// The valid filter keys are event-specific.
- scoped_ptr<base::DictionaryValue> filter_;
+ std::unique_ptr<base::DictionaryValue> filter_;
int routing_id_;
« no previous file with comments | « extensions/common/event_filtering_info.cc ('k') | extensions/common/event_matcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698