diff options
author | mostynb <mostynb@opera.com> | 2014-10-03 09:32:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 16:32:37 +0000 |
commit | 0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch) | |
tree | b8777ad781ca887318c7760bb7380fd662497558 /extensions/common/features | |
parent | c0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff) | |
download | chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2 |
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463
Review URL: https://codereview.chromium.org/622343002
Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/common/features')
-rw-r--r-- | extensions/common/features/api_feature.h | 4 | ||||
-rw-r--r-- | extensions/common/features/base_feature_provider.h | 8 | ||||
-rw-r--r-- | extensions/common/features/complex_feature.h | 12 | ||||
-rw-r--r-- | extensions/common/features/manifest_feature.h | 4 | ||||
-rw-r--r-- | extensions/common/features/permission_feature.h | 4 | ||||
-rw-r--r-- | extensions/common/features/simple_feature.h | 12 |
6 files changed, 22 insertions, 22 deletions
diff --git a/extensions/common/features/api_feature.h b/extensions/common/features/api_feature.h index c146f9d..3cc86dbc 100644 --- a/extensions/common/features/api_feature.h +++ b/extensions/common/features/api_feature.h @@ -17,9 +17,9 @@ class APIFeature : public SimpleFeature { virtual ~APIFeature(); // extensions::Feature: - virtual bool IsInternal() const OVERRIDE; + virtual bool IsInternal() const override; - virtual std::string Parse(const base::DictionaryValue* value) OVERRIDE; + virtual 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 acb8df3..d878acf 100644 --- a/extensions/common/features/base_feature_provider.h +++ b/extensions/common/features/base_feature_provider.h @@ -28,12 +28,12 @@ class BaseFeatureProvider : public FeatureProvider { virtual ~BaseFeatureProvider(); // 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 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; + override; - virtual const std::vector<std::string>& GetAllFeatureNames() const OVERRIDE; + virtual 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 bbb73e4..f1794fe 100644 --- a/extensions/common/features/complex_feature.h +++ b/extensions/common/features/complex_feature.h @@ -30,15 +30,15 @@ class ComplexFeature : public Feature { Manifest::Type type, Manifest::Location location, int manifest_version, - Platform platform) const OVERRIDE; + Platform platform) const override; virtual Availability IsAvailableToContext(const Extension* extension, Context context, const GURL& url, - Platform platform) const OVERRIDE; + Platform platform) const override; - virtual bool IsIdInBlacklist(const std::string& extension_id) const OVERRIDE; - virtual bool IsIdInWhitelist(const std::string& extension_id) const OVERRIDE; + virtual bool IsIdInBlacklist(const std::string& extension_id) const override; + virtual bool IsIdInWhitelist(const std::string& extension_id) const override; protected: // extensions::Feature: @@ -46,9 +46,9 @@ class ComplexFeature : public Feature { AvailabilityResult result, Manifest::Type type, const GURL& url, - Context context) const OVERRIDE; + Context context) const override; - virtual bool IsInternal() const OVERRIDE; + virtual bool IsInternal() const override; private: FeatureList features_; diff --git a/extensions/common/features/manifest_feature.h b/extensions/common/features/manifest_feature.h index 1c0fe0b..b4d3808 100644 --- a/extensions/common/features/manifest_feature.h +++ b/extensions/common/features/manifest_feature.h @@ -20,9 +20,9 @@ class ManifestFeature : public SimpleFeature { const Extension* extension, Feature::Context context, const GURL& url, - Feature::Platform platform) const OVERRIDE; + Feature::Platform platform) const override; - virtual std::string Parse(const base::DictionaryValue* value) OVERRIDE; + virtual 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 5916fdd..66f8587 100644 --- a/extensions/common/features/permission_feature.h +++ b/extensions/common/features/permission_feature.h @@ -20,9 +20,9 @@ class PermissionFeature : public SimpleFeature { const Extension* extension, Feature::Context context, const GURL& url, - Feature::Platform platform) const OVERRIDE; + Feature::Platform platform) const override; - virtual std::string Parse(const base::DictionaryValue* value) OVERRIDE; + virtual 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 395e7e7..5cf2a10 100644 --- a/extensions/common/features/simple_feature.h +++ b/extensions/common/features/simple_feature.h @@ -93,22 +93,22 @@ class SimpleFeature : public Feature { Manifest::Type type, Manifest::Location location, int manifest_version, - Platform platform) const OVERRIDE; + Platform platform) const override; virtual Availability IsAvailableToContext(const Extension* extension, Context context, const GURL& url, - Platform platform) const OVERRIDE; + Platform platform) const override; virtual std::string GetAvailabilityMessage(AvailabilityResult result, Manifest::Type type, const GURL& url, - Context context) const OVERRIDE; + Context context) const override; - virtual bool IsInternal() 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; + virtual bool IsIdInBlacklist(const std::string& extension_id) const override; + virtual bool IsIdInWhitelist(const std::string& extension_id) const override; static bool IsIdInList(const std::string& extension_id, const std::set<std::string>& list); |