| Index: chrome/common/extensions/features/simple_feature_provider.h
|
| diff --git a/chrome/common/extensions/features/simple_feature_provider.h b/chrome/common/extensions/features/simple_feature_provider.h
|
| index 6da884e256e042694e3ae102c764f42a7464d4e8..e4000dee0e9e9d396ce7a8f5dc386ea54b1cf7b1 100644
|
| --- a/chrome/common/extensions/features/simple_feature_provider.h
|
| +++ b/chrome/common/extensions/features/simple_feature_provider.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CHROME_COMMON_EXTENSIONS_FEATURES_SIMPLE_FEATURE_PROVIDER_H_
|
| #define CHROME_COMMON_EXTENSIONS_FEATURES_SIMPLE_FEATURE_PROVIDER_H_
|
|
|
| +#include <map>
|
| #include <set>
|
| #include <string>
|
|
|
| @@ -12,13 +13,14 @@
|
| #include "base/values.h"
|
| #include "chrome/common/extensions/features/feature.h"
|
| #include "chrome/common/extensions/features/feature_provider.h"
|
| +#include "chrome/common/extensions/features/simple_feature.h"
|
|
|
| namespace extensions {
|
|
|
| // Reads Features out of a simple JSON file description.
|
| class SimpleFeatureProvider : public FeatureProvider {
|
| public:
|
| - typedef Feature*(*FeatureFactory)();
|
| + typedef SimpleFeature*(*FeatureFactory)();
|
|
|
| // Creates a new SimpleFeatureProvider. Pass null to |factory| to have the
|
| // provider create plain old Feature instances.
|
| @@ -37,10 +39,10 @@ class SimpleFeatureProvider : public FeatureProvider {
|
| std::set<std::string> GetAllFeatureNames() const;
|
|
|
| // Gets the feature |feature_name|, if it exists.
|
| - virtual Feature* GetFeature(const std::string& feature_name) OVERRIDE;
|
| + virtual SimpleFeature* GetFeature(const std::string& feature_name) OVERRIDE;
|
|
|
| private:
|
| - typedef std::map<std::string, linked_ptr<Feature> > FeatureMap;
|
| + typedef std::map<std::string, linked_ptr<SimpleFeature> > FeatureMap;
|
| FeatureMap features_;
|
|
|
| FeatureFactory factory_;
|
|
|