| Index: extensions/shell/common/shell_extensions_client.cc
|
| diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
|
| index a598dede0294e78cc9b501f7b4dc5cb6513216bb..48fa563dc375c1a2a5f4a5804c56ccbaf4328dc1 100644
|
| --- a/extensions/shell/common/shell_extensions_client.cc
|
| +++ b/extensions/shell/common/shell_extensions_client.cc
|
| @@ -11,6 +11,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/json_feature_provider_source.h"
|
| #include "extensions/common/features/manifest_feature.h"
|
| #include "extensions/common/features/permission_feature.h"
|
| @@ -115,6 +116,9 @@ scoped_ptr<FeatureProvider> ShellExtensionsClient::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();
|
| }
|
| @@ -133,6 +137,8 @@ ShellExtensionsClient::CreateFeatureProviderSource(
|
| source->LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
|
| } else if (name == "permission") {
|
| source->LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
|
| + } else if (name == "behavior") {
|
| + source->LoadJSON(IDR_EXTENSION_BEHAVIOR_FEATURES);
|
| } else {
|
| NOTREACHED();
|
| source.reset();
|
|
|