Chromium Code Reviews| Index: apps/shell/common/shell_extensions_client.cc |
| diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc |
| index 6abe2b6fe259d03f617f0ccf284ba1c6ad7a7a07..10f3fcf33ca2d3ea06a4a1f344229c8ebc6515f8 100644 |
| --- a/apps/shell/common/shell_extensions_client.cc |
| +++ b/apps/shell/common/shell_extensions_client.cc |
| @@ -22,7 +22,6 @@ |
| #include "extensions/common/permissions/permissions_provider.h" |
| #include "extensions/common/url_pattern_set.h" |
| #include "grit/app_shell_resources.h" |
| -#include "grit/common_resources.h" |
| #include "grit/extensions_resources.h" |
| using extensions::APIPermissionInfo; |
| @@ -135,18 +134,14 @@ scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider( |
| if (name == "api") { |
| source.LoadJSON(IDR_EXTENSION_API_FEATURES); |
| source.LoadJSON(IDR_SHELL_EXTENSION_API_FEATURES); |
| - // TODO(yoz): Don't include Chrome resources. |
|
James Cook
2014/05/06 15:57:03
Hooray!
|
| - source.LoadJSON(IDR_CHROME_EXTENSION_API_FEATURES); |
| return scoped_ptr<FeatureProvider>(new BaseFeatureProvider( |
| source.dictionary(), CreateFeature<extensions::APIFeature>)); |
| } else if (name == "manifest") { |
| source.LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES); |
| - source.LoadJSON(IDR_CHROME_EXTENSION_MANIFEST_FEATURES); |
| return scoped_ptr<FeatureProvider>(new BaseFeatureProvider( |
| source.dictionary(), CreateFeature<extensions::ManifestFeature>)); |
| } else if (name == "permission") { |
| source.LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES); |
| - source.LoadJSON(IDR_CHROME_EXTENSION_PERMISSION_FEATURES); |
| return scoped_ptr<FeatureProvider>(new BaseFeatureProvider( |
| source.dictionary(), CreateFeature<extensions::PermissionFeature>)); |
| } else { |