| Index: chrome/common/extensions/features/complex_feature.cc
|
| diff --git a/chrome/common/extensions/features/complex_feature.cc b/chrome/common/extensions/features/complex_feature.cc
|
| index c4e5445df0750c3c5ac5bd1655ee2f6befc7a73e..43a41b0c3a5fe30d23af9a0d633a23820801c690 100644
|
| --- a/chrome/common/extensions/features/complex_feature.cc
|
| +++ b/chrome/common/extensions/features/complex_feature.cc
|
| @@ -38,16 +38,19 @@ Feature::Availability ComplexFeature::IsAvailableToManifest(
|
| }
|
|
|
| Feature::Availability ComplexFeature::IsAvailableToContext(
|
| - const Extension* extension, Context context, Platform platform) const {
|
| + const Extension* extension,
|
| + Context context,
|
| + const GURL& url,
|
| + Platform platform) const {
|
| Feature::Availability first_availability =
|
| - features_[0]->IsAvailableToContext(extension, context, platform);
|
| + features_[0]->IsAvailableToContext(extension, context, url, platform);
|
| if (first_availability.is_available())
|
| return first_availability;
|
|
|
| for (FeatureList::const_iterator it = features_.begin() + 1;
|
| it != features_.end(); ++it) {
|
| Availability availability =
|
| - (*it)->IsAvailableToContext(extension, context, platform);
|
| + (*it)->IsAvailableToContext(extension, context, url, platform);
|
| if (availability.is_available())
|
| return availability;
|
| }
|
| @@ -65,13 +68,14 @@ std::set<Feature::Context>* ComplexFeature::GetContexts() {
|
| }
|
|
|
| std::string ComplexFeature::GetAvailabilityMessage(AvailabilityResult result,
|
| - Manifest::Type type) const {
|
| + Manifest::Type type,
|
| + const GURL& url) const {
|
| if (result == IS_AVAILABLE)
|
| return "";
|
|
|
| // TODO(justinlin): Form some kind of combined availabilities/messages from
|
| // SimpleFeatures.
|
| - return features_[0]->GetAvailabilityMessage(result, type);
|
| + return features_[0]->GetAvailabilityMessage(result, type, url);
|
| }
|
|
|
| } // namespace extensions
|
|
|