Index: extensions/common/permissions/permissions_data.cc |
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc |
index 268fb823cb3a49df57d322e773486ad28f56044f..8d06ee604553fe716dd027dc1ce4385220fe5cb4 100644 |
--- a/extensions/common/permissions/permissions_data.cc |
+++ b/extensions/common/permissions/permissions_data.cc |
@@ -584,12 +584,13 @@ bool PermissionsData::RequiresActionForScriptExecution( |
int tab_id, |
const GURL& url) { |
// For now, the user should be notified when an extension with all hosts |
- // permission tries to execute a script on a page, with exceptions for policy- |
- // enabled and component extensions. If this doesn't meet those criteria, |
- // return immediately. |
+ // permission tries to execute a script on a page. Exceptions for policy- |
+ // enabled and component extensions, and extensions which are whitelisted to |
+ // execute scripts everywhere. |
if (!extension->ShouldDisplayInExtensionSettings() || |
Manifest::IsPolicyLocation(extension->location()) || |
Manifest::IsComponentLocation(extension->location()) || |
+ CanExecuteScriptEverywhere(extension) || |
!ShouldWarnAllHosts(extension)) { |
return false; |
} |