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

Unified Diff: extensions/common/features/complex_feature.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/features/base_feature_provider.cc ('k') | extensions/common/features/complex_feature.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/features/complex_feature.h
diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h
index a1a0f67a698c1811db26e0c01176f5dfe6994122..901983889eaffdf1e7cdfacc31483a8e323d27dc 100644
--- a/extensions/common/features/complex_feature.h
+++ b/extensions/common/features/complex_feature.h
@@ -5,12 +5,12 @@
#ifndef EXTENSIONS_COMMON_FEATURES_COMPLEX_FEATURE_H_
#define EXTENSIONS_COMMON_FEATURES_COMPLEX_FEATURE_H_
+#include <memory>
#include <set>
#include <string>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "extensions/common/extension.h"
#include "extensions/common/features/feature.h"
#include "extensions/common/manifest.h"
@@ -22,9 +22,9 @@ namespace extensions {
// available, but not if only some combination of Features is available.
class ComplexFeature : public Feature {
public:
- using FeatureList = std::vector<scoped_ptr<Feature>>;
+ using FeatureList = std::vector<std::unique_ptr<Feature>>;
- explicit ComplexFeature(scoped_ptr<FeatureList> features);
+ explicit ComplexFeature(std::unique_ptr<FeatureList> features);
~ComplexFeature() override;
// extensions::Feature:
« no previous file with comments | « extensions/common/features/base_feature_provider.cc ('k') | extensions/common/features/complex_feature.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698