| 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..01fe44e11e4336a88d067d3b6b4f2a35b316ba34 100644
|
| --- a/extensions/shell/common/shell_extensions_client.cc
|
| +++ b/extensions/shell/common/shell_extensions_client.cc
|
| @@ -15,6 +15,7 @@
|
| #include "extensions/common/features/manifest_feature.h"
|
| #include "extensions/common/features/permission_feature.h"
|
| #include "extensions/common/features/simple_feature.h"
|
| +#include "extensions/common/features/switch_feature.h"
|
| #include "extensions/common/manifest_handler.h"
|
| #include "extensions/common/permissions/permission_message_provider.h"
|
| #include "extensions/common/permissions/permissions_info.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 == "switch") {
|
| + provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + CreateFeature<SwitchFeature>));
|
| } 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 == "switch") {
|
| + source->LoadJSON(IDR_EXTENSION_SWITCH_FEATURES);
|
| } else {
|
| NOTREACHED();
|
| source.reset();
|
|
|