| Index: chrome/common/extensions/chrome_extensions_client.cc
|
| diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
|
| index 4f2fbc2d0ca94f5e13193f50a9c652feb4bbd183..8fce55435dcca79c1daa9cee3b00048923817f1d 100644
|
| --- a/chrome/common/extensions/chrome_extensions_client.cc
|
| +++ b/chrome/common/extensions/chrome_extensions_client.cc
|
| @@ -32,6 +32,7 @@
|
| #include "extensions/common/extension_urls.h"
|
| #include "extensions/common/features/api_feature.h"
|
| #include "extensions/common/features/base_feature_provider.h"
|
| +#include "extensions/common/features/behavior_feature.h"
|
| #include "extensions/common/features/feature_provider.h"
|
| #include "extensions/common/features/json_feature_provider_source.h"
|
| #include "extensions/common/features/manifest_feature.h"
|
| @@ -144,6 +145,9 @@ scoped_ptr<FeatureProvider> ChromeExtensionsClient::CreateFeatureProvider(
|
| } else if (name == "permission") {
|
| provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| CreateFeature<PermissionFeature>));
|
| + } else if (name == "behavior") {
|
| + provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + CreateFeature<BehaviorFeature>));
|
| } else {
|
| NOTREACHED();
|
| }
|
| @@ -164,6 +168,8 @@ ChromeExtensionsClient::CreateFeatureProviderSource(
|
| } else if (name == "permission") {
|
| source->LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
|
| source->LoadJSON(IDR_CHROME_EXTENSION_PERMISSION_FEATURES);
|
| + } else if (name == "behavior") {
|
| + source->LoadJSON(IDR_EXTENSION_BEHAVIOR_FEATURES);
|
| } else {
|
| NOTREACHED();
|
| source.reset();
|
|
|