summaryrefslogtreecommitdiffstats
path: root/extensions/common/features
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:38:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:38:39 +0000
commit9168b2fe3e30afa4fd9a9500ba0725edf97c20a3 (patch)
treebb288d5b7fccc259391b83b18b12368a0d516b21 /extensions/common/features
parentae36a4a3f2efd040be2e563b0bff0592b0a5b5a1 (diff)
downloadchromium_src-9168b2fe3e30afa4fd9a9500ba0725edf97c20a3.zip
chromium_src-9168b2fe3e30afa4fd9a9500ba0725edf97c20a3.tar.gz
chromium_src-9168b2fe3e30afa4fd9a9500ba0725edf97c20a3.tar.bz2
Standardize usage of virtual/override/final in extensions/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=yoz@chromium.org Review URL: https://codereview.chromium.org/664933004 Cr-Commit-Position: refs/heads/master@{#300475}
Diffstat (limited to 'extensions/common/features')
-rw-r--r--extensions/common/features/api_feature.h6
-rw-r--r--extensions/common/features/base_feature_provider.h11
-rw-r--r--extensions/common/features/complex_feature.h35
-rw-r--r--extensions/common/features/manifest_feature.h6
-rw-r--r--extensions/common/features/permission_feature.h6
-rw-r--r--extensions/common/features/simple_feature.h42
6 files changed, 52 insertions, 54 deletions
diff --git a/extensions/common/features/api_feature.h b/extensions/common/features/api_feature.h
index 3cc86dbc..7a30cb4 100644
--- a/extensions/common/features/api_feature.h
+++ b/extensions/common/features/api_feature.h
@@ -14,12 +14,12 @@ namespace extensions {
class APIFeature : public SimpleFeature {
public:
APIFeature();
- virtual ~APIFeature();
+ ~APIFeature() override;
// extensions::Feature:
- virtual bool IsInternal() const override;
+ bool IsInternal() const override;
- virtual std::string Parse(const base::DictionaryValue* value) override;
+ std::string Parse(const base::DictionaryValue* value) override;
private:
bool internal_;
diff --git a/extensions/common/features/base_feature_provider.h b/extensions/common/features/base_feature_provider.h
index d878acf..e82c46d 100644
--- a/extensions/common/features/base_feature_provider.h
+++ b/extensions/common/features/base_feature_provider.h
@@ -25,15 +25,14 @@ class BaseFeatureProvider : public FeatureProvider {
// provider create plain old Feature instances.
BaseFeatureProvider(const base::DictionaryValue& root,
FeatureFactory factory);
- virtual ~BaseFeatureProvider();
+ ~BaseFeatureProvider() override;
// Gets the feature |feature_name|, if it exists.
- virtual Feature* GetFeature(const std::string& feature_name) const override;
- virtual Feature* GetParent(Feature* feature) const override;
- virtual std::vector<Feature*> GetChildren(const Feature& parent) const
- override;
+ Feature* GetFeature(const std::string& feature_name) const override;
+ Feature* GetParent(Feature* feature) const override;
+ std::vector<Feature*> GetChildren(const Feature& parent) const override;
- virtual const std::vector<std::string>& GetAllFeatureNames() const override;
+ const std::vector<std::string>& GetAllFeatureNames() const override;
private:
typedef std::map<std::string, linked_ptr<Feature> > FeatureMap;
diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h
index f1794fe..2762805 100644
--- a/extensions/common/features/complex_feature.h
+++ b/extensions/common/features/complex_feature.h
@@ -23,32 +23,31 @@ class ComplexFeature : public Feature {
typedef ScopedVector<Feature> FeatureList;
explicit ComplexFeature(scoped_ptr<FeatureList> features);
- virtual ~ComplexFeature();
+ ~ComplexFeature() override;
// extensions::Feature:
- virtual Availability IsAvailableToManifest(const std::string& extension_id,
- Manifest::Type type,
- Manifest::Location location,
- int manifest_version,
- Platform platform) const override;
+ Availability IsAvailableToManifest(const std::string& extension_id,
+ Manifest::Type type,
+ Manifest::Location location,
+ int manifest_version,
+ Platform platform) const override;
- virtual Availability IsAvailableToContext(const Extension* extension,
- Context context,
- const GURL& url,
- Platform platform) const override;
+ Availability IsAvailableToContext(const Extension* extension,
+ Context context,
+ const GURL& url,
+ Platform platform) const override;
- virtual bool IsIdInBlacklist(const std::string& extension_id) const override;
- virtual bool IsIdInWhitelist(const std::string& extension_id) const override;
+ bool IsIdInBlacklist(const std::string& extension_id) const override;
+ bool IsIdInWhitelist(const std::string& extension_id) const override;
protected:
// extensions::Feature:
- virtual std::string GetAvailabilityMessage(
- AvailabilityResult result,
- Manifest::Type type,
- const GURL& url,
- Context context) const override;
+ std::string GetAvailabilityMessage(AvailabilityResult result,
+ Manifest::Type type,
+ const GURL& url,
+ Context context) const override;
- virtual bool IsInternal() const override;
+ bool IsInternal() const override;
private:
FeatureList features_;
diff --git a/extensions/common/features/manifest_feature.h b/extensions/common/features/manifest_feature.h
index b4d3808..ab77d02 100644
--- a/extensions/common/features/manifest_feature.h
+++ b/extensions/common/features/manifest_feature.h
@@ -14,15 +14,15 @@ namespace extensions {
class ManifestFeature : public SimpleFeature {
public:
ManifestFeature();
- virtual ~ManifestFeature();
+ ~ManifestFeature() override;
- virtual Feature::Availability IsAvailableToContext(
+ Feature::Availability IsAvailableToContext(
const Extension* extension,
Feature::Context context,
const GURL& url,
Feature::Platform platform) const override;
- virtual std::string Parse(const base::DictionaryValue* value) override;
+ std::string Parse(const base::DictionaryValue* value) override;
};
} // namespace extensions
diff --git a/extensions/common/features/permission_feature.h b/extensions/common/features/permission_feature.h
index 66f8587..ff4a0ad 100644
--- a/extensions/common/features/permission_feature.h
+++ b/extensions/common/features/permission_feature.h
@@ -14,15 +14,15 @@ namespace extensions {
class PermissionFeature : public SimpleFeature {
public:
PermissionFeature();
- virtual ~PermissionFeature();
+ ~PermissionFeature() override;
- virtual Feature::Availability IsAvailableToContext(
+ Feature::Availability IsAvailableToContext(
const Extension* extension,
Feature::Context context,
const GURL& url,
Feature::Platform platform) const override;
- virtual std::string Parse(const base::DictionaryValue* value) override;
+ std::string Parse(const base::DictionaryValue* value) override;
};
} // namespace extensions
diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h
index 5cf2a10..cb34108 100644
--- a/extensions/common/features/simple_feature.h
+++ b/extensions/common/features/simple_feature.h
@@ -24,7 +24,7 @@ namespace extensions {
class SimpleFeature : public Feature {
public:
SimpleFeature();
- virtual ~SimpleFeature();
+ ~SimpleFeature() override;
// Similar to Manifest::Location, these are the classes of locations
// supported in feature files; "component" implies
@@ -89,26 +89,26 @@ class SimpleFeature : public Feature {
}
// extension::Feature:
- virtual Availability IsAvailableToManifest(const std::string& extension_id,
- Manifest::Type type,
- Manifest::Location location,
- int manifest_version,
- Platform platform) const override;
-
- virtual Availability IsAvailableToContext(const Extension* extension,
- Context context,
- const GURL& url,
- Platform platform) const override;
-
- virtual std::string GetAvailabilityMessage(AvailabilityResult result,
- Manifest::Type type,
- const GURL& url,
- Context context) const override;
-
- virtual bool IsInternal() const override;
-
- virtual bool IsIdInBlacklist(const std::string& extension_id) const override;
- virtual bool IsIdInWhitelist(const std::string& extension_id) const override;
+ Availability IsAvailableToManifest(const std::string& extension_id,
+ Manifest::Type type,
+ Manifest::Location location,
+ int manifest_version,
+ Platform platform) const override;
+
+ Availability IsAvailableToContext(const Extension* extension,
+ Context context,
+ const GURL& url,
+ Platform platform) const override;
+
+ std::string GetAvailabilityMessage(AvailabilityResult result,
+ Manifest::Type type,
+ const GURL& url,
+ Context context) const override;
+
+ bool IsInternal() const override;
+
+ bool IsIdInBlacklist(const std::string& extension_id) const override;
+ bool IsIdInWhitelist(const std::string& extension_id) const override;
static bool IsIdInList(const std::string& extension_id,
const std::set<std::string>& list);