Chromium Code Reviews| 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 cac199693479b2da7d9c054ef3ea77d6296e3de6..328108b682876d4ae38752d90e1ecb3e1f0ffda1 100644 |
| --- a/chrome/common/extensions/chrome_extensions_client.cc |
| +++ b/chrome/common/extensions/chrome_extensions_client.cc |
| @@ -18,6 +18,7 @@ |
| #include "chrome/common/extensions/api/generated_schemas.h" |
| #include "chrome/common/extensions/api/manifest_features.h" |
| #include "chrome/common/extensions/api/permission_features.h" |
| +#include "chrome/common/extensions/chrome_aliases.h" |
| #include "chrome/common/extensions/chrome_manifest_handlers.h" |
| #include "chrome/common/extensions/extension_constants.h" |
| #include "chrome/common/extensions/manifest_handlers/theme_handler.h" |
| @@ -27,6 +28,7 @@ |
| #include "chrome/grit/generated_resources.h" |
| #include "components/version_info/version_info.h" |
| #include "content/public/common/url_constants.h" |
| +#include "extensions/common/alias.h" |
|
Devlin
2016/10/07 18:36:21
needed?
tbarzic
2016/10/07 20:41:17
Done.
|
| #include "extensions/common/api/generated_schemas.h" |
| #include "extensions/common/common_manifest_handlers.h" |
| #include "extensions/common/constants.h" |
| @@ -34,6 +36,7 @@ |
| #include "extensions/common/extension_api.h" |
| #include "extensions/common/extension_icon_set.h" |
| #include "extensions/common/extension_urls.h" |
| +#include "extensions/common/extensions_aliases.h" |
| #include "extensions/common/features/api_feature.h" |
| #include "extensions/common/features/behavior_feature.h" |
| #include "extensions/common/features/feature_channel.h" |
| @@ -118,8 +121,10 @@ void ChromeExtensionsClient::Initialize() { |
| } |
| // Set up permissions. |
| - PermissionsInfo::GetInstance()->AddProvider(chrome_api_permissions_); |
| - PermissionsInfo::GetInstance()->AddProvider(extensions_api_permissions_); |
| + PermissionsInfo::GetInstance()->AddProvider(chrome_api_permissions_, |
| + GetChromePermissionAliases()); |
| + PermissionsInfo::GetInstance()->AddProvider(extensions_api_permissions_, |
| + GetExtensionsPermissionAliases()); |
| // Set up the scripting whitelist. |
| // Whitelist ChromeVox, an accessibility extension from Google that needs |