| Index: extensions/common/permissions/permissions_data.cc
|
| diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
|
| index 0488f0a1b17c3c0e8412120253b3a85363585850..f0c612c5042b379222caff82c544bbbb6c05f457 100644
|
| --- a/extensions/common/permissions/permissions_data.cc
|
| +++ b/extensions/common/permissions/permissions_data.cc
|
| @@ -49,18 +49,24 @@ void PermissionsData::SetPolicyDelegate(PolicyDelegate* delegate) {
|
| }
|
|
|
| // static
|
| -bool PermissionsData::CanExecuteScriptEverywhere(const Extension* extension) {
|
| - if (extension->location() == Manifest::COMPONENT)
|
| - return true;
|
| -
|
| +bool PermissionsData::IsExtensionIdWhitelisted(
|
| + const std::string& extension_id) {
|
| const ExtensionsClient::ScriptingWhitelist& whitelist =
|
| ExtensionsClient::Get()->GetScriptingWhitelist();
|
|
|
| - return std::find(whitelist.begin(), whitelist.end(), extension->id()) !=
|
| + return std::find(whitelist.begin(), whitelist.end(), extension_id) !=
|
| whitelist.end();
|
| }
|
|
|
| // static
|
| +bool PermissionsData::CanExecuteScriptEverywhere(const Extension* extension) {
|
| + if (extension->location() == Manifest::COMPONENT)
|
| + return true;
|
| +
|
| + return IsExtensionIdWhitelisted(extension->id());
|
| +}
|
| +
|
| +// static
|
| bool PermissionsData::ScriptsMayRequireActionForExtension(
|
| const Extension* extension,
|
| const PermissionSet* permissions) {
|
|
|