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

Unified Diff: chrome/common/extensions/features/simple_feature.h

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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: chrome/common/extensions/features/simple_feature.h
diff --git a/chrome/common/extensions/features/simple_feature.h b/chrome/common/extensions/features/simple_feature.h
index c21716f7054753f80f53eb3a4d67091b828e35c8..65884e7ebb2b022a38c74236e92d9556d6676055 100644
--- a/chrome/common/extensions/features/simple_feature.h
+++ b/chrome/common/extensions/features/simple_feature.h
@@ -12,6 +12,7 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/manifest.h"
namespace extensions {
@@ -24,7 +25,7 @@ class SimpleFeature : public Feature {
virtual ~SimpleFeature();
std::set<std::string>* whitelist() { return &whitelist_; }
- std::set<Extension::Type>* extension_types() { return &extension_types_; }
+ std::set<Manifest::Type>* extension_types() { return &extension_types_; }
// Parses the JSON representation of a feature into the fields of this object.
// Unspecified values in the JSON are not modified in the object. This allows
@@ -57,7 +58,7 @@ class SimpleFeature : public Feature {
// extension::Feature:
virtual Availability IsAvailableToManifest(const std::string& extension_id,
- Extension::Type type,
+ Manifest::Type type,
Location location,
int manifest_version,
Platform platform) const OVERRIDE;
@@ -67,14 +68,14 @@ class SimpleFeature : public Feature {
Platform platform) const OVERRIDE;
virtual std::string GetAvailabilityMessage(
- AvailabilityResult result, Extension::Type type) const OVERRIDE;
+ AvailabilityResult result, Manifest::Type type) const OVERRIDE;
virtual std::set<Context>* GetContexts() OVERRIDE;
protected:
Availability CreateAvailability(AvailabilityResult result) const;
Availability CreateAvailability(AvailabilityResult result,
- Extension::Type type) const;
+ Manifest::Type type) const;
private:
// For clarity and consistency, we handle the default value of each of these
@@ -82,7 +83,7 @@ class SimpleFeature : public Feature {
// code that reads Features out of static data to validate that data and set
// sensible defaults.
std::set<std::string> whitelist_;
- std::set<Extension::Type> extension_types_;
+ std::set<Manifest::Type> extension_types_;
std::set<Context> contexts_;
Location location_; // we only care about component/not-component now
Platform platform_; // we only care about chromeos/not-chromeos now

Powered by Google App Engine
This is Rietveld 408576698