| Index: extensions/common/features/simple_feature.cc
|
| diff --git a/extensions/common/features/simple_feature.cc b/extensions/common/features/simple_feature.cc
|
| index c472ae812f07752646fb2a0e0cd70f4e4c40d33c..2219ace3e92407ec0ae5b8e147b5cac3f9dd6c96 100644
|
| --- a/extensions/common/features/simple_feature.cc
|
| +++ b/extensions/common/features/simple_feature.cc
|
| @@ -59,6 +59,8 @@ struct Mappings {
|
| contexts["webui"] = Feature::WEBUI_CONTEXT;
|
|
|
| locations["component"] = SimpleFeature::COMPONENT_LOCATION;
|
| + locations["external_component"] =
|
| + SimpleFeature::EXTERNAL_COMPONENT_LOCATION;
|
| locations["policy"] = SimpleFeature::POLICY_LOCATION;
|
|
|
| platforms["chromeos"] = Feature::CHROMEOS_PLATFORM;
|
| @@ -570,8 +572,9 @@ bool SimpleFeature::MatchesManifestLocation(
|
| case SimpleFeature::UNSPECIFIED_LOCATION:
|
| return true;
|
| case SimpleFeature::COMPONENT_LOCATION:
|
| - // TODO(kalman/asargent): Should this include EXTERNAL_COMPONENT too?
|
| return manifest_location == Manifest::COMPONENT;
|
| + case SimpleFeature::EXTERNAL_COMPONENT_LOCATION:
|
| + return manifest_location == Manifest::EXTERNAL_COMPONENT;
|
| case SimpleFeature::POLICY_LOCATION:
|
| return manifest_location == Manifest::EXTERNAL_POLICY ||
|
| manifest_location == Manifest::EXTERNAL_POLICY_DOWNLOAD;
|
|
|