Index: extensions/common/features/simple_feature.h |
diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h |
index e3884e014c73da53a6c994a45be303c964c50ddd..c085928b7712a14482bb813666c92d86540ae849 100644 |
--- a/extensions/common/features/simple_feature.h |
+++ b/extensions/common/features/simple_feature.h |
@@ -39,8 +39,7 @@ class SimpleFeature : public Feature { |
// the error found, or an empty string on success. |
virtual std::string Parse(const base::DictionaryValue* value); |
- Location location() const { return location_; } |
- void set_location(Location location) { location_ = location; } |
+ std::set<Manifest::Location>* locations() { return &locations_; } |
std::set<Platform>* platforms() { return &platforms_; } |
@@ -72,7 +71,7 @@ class SimpleFeature : public Feature { |
// extension::Feature: |
virtual Availability IsAvailableToManifest(const std::string& extension_id, |
Manifest::Type type, |
- Location location, |
+ Manifest::Location location, |
int manifest_version, |
Platform platform) const OVERRIDE; |
@@ -113,7 +112,7 @@ class SimpleFeature : public Feature { |
std::set<Manifest::Type> extension_types_; |
std::set<Context> contexts_; |
URLPatternSet matches_; |
- Location location_; // we only care about component/not-component now |
+ std::set<Manifest::Location> locations_; |
std::set<Platform> platforms_; |
int min_manifest_version_; |
int max_manifest_version_; |