Index: extensions/common/features/feature.h |
diff --git a/extensions/common/features/feature.h b/extensions/common/features/feature.h |
index 8afc15d1dce7d7769e90bb340eb6ecf19534a5c6..d5e5a86a4469adaca335f0a049c3e1ead230e389 100644 |
--- a/extensions/common/features/feature.h |
+++ b/extensions/common/features/feature.h |
@@ -46,12 +46,6 @@ class Feature { |
BLESSED_WEB_PAGE_CONTEXT, |
}; |
- // The location required of extensions the feature is supported in. |
- enum Location { |
- UNSPECIFIED_LOCATION, |
- COMPONENT_LOCATION |
- }; |
- |
// The platforms the feature is supported in. |
enum Platform { |
UNSPECIFIED_PLATFORM, |
@@ -112,9 +106,6 @@ class Feature { |
// Gets the platform the code is currently running on. |
static Platform GetCurrentPlatform(); |
- // Gets the Feature::Location value for the specified Manifest::Location. |
- static Location ConvertLocation(Manifest::Location extension_location); |
- |
virtual std::set<Context>* GetContexts() = 0; |
// Tests whether this is an internal API or not. |
@@ -127,17 +118,20 @@ class Feature { |
// manifest. |
Availability IsAvailableToManifest(const std::string& extension_id, |
Manifest::Type type, |
- Location location, |
+ Manifest::Location location, |
int manifest_version) const { |
return IsAvailableToManifest(extension_id, type, location, manifest_version, |
GetCurrentPlatform()); |
} |
virtual Availability IsAvailableToManifest(const std::string& extension_id, |
Manifest::Type type, |
- Location location, |
+ Manifest::Location location, |
int manifest_version, |
Platform platform) const = 0; |
+ // Returns true if the feature is available to |extension|. |
+ Availability IsAvailableToExtension(const Extension* extension); |
not at google - send to devlin
2014/04/17 21:33:14
always irritated me that we don't have this.
|
+ |
// Returns true if the feature is available to be used in the specified |
// extension and context. |
Availability IsAvailableToContext(const Extension* extension, |