| Index: extensions/common/features/complex_feature.h
|
| diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h
|
| index f1794feac1c12de66ca207dd75db175a9b07ee25..276280522f843122e8594898e58bfa5feeed451c 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_;
|
|
|