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

Unified Diff: extensions/common/features/base_feature_provider.h

Issue 1768103002: Use scoped_ptr instead of linked_ptr from /e/c/features/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: extensions/common/features/base_feature_provider.h
diff --git a/extensions/common/features/base_feature_provider.h b/extensions/common/features/base_feature_provider.h
index e82c46d5ab819100b58be6150f83b96104f72b04..3b766c8001db2421c1ab355493dc506c5167521d 100644
--- a/extensions/common/features/base_feature_provider.h
+++ b/extensions/common/features/base_feature_provider.h
@@ -9,11 +9,14 @@
#include <string>
#include <vector>
-#include "base/memory/linked_ptr.h"
-#include "base/values.h"
+#include "base/memory/scoped_ptr.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/common/features/simple_feature.h"
+namespace Base {
+class DictionaryValue;
+}
+
namespace extensions {
// Reads Features out of a simple JSON file description.
@@ -35,8 +38,7 @@ class BaseFeatureProvider : public FeatureProvider {
const std::vector<std::string>& GetAllFeatureNames() const override;
private:
- typedef std::map<std::string, linked_ptr<Feature> > FeatureMap;
- FeatureMap features_;
+ std::map<std::string, scoped_ptr<Feature>> features_;
// Populated on first use.
mutable std::vector<std::string> feature_names_;

Powered by Google App Engine
This is Rietveld 408576698