Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1652)

Unified Diff: extensions/common/permissions/permissions_data.cc

Issue 2934583002: Reland: chrome.webRequest support for ExtensionSettings (Closed)
Patch Set: Fix flaky test ExtensionApiTestWithManagementPolicy.InitiatorProtectedByPolicy Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/permissions_data.cc
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 245040e6f542b703b342ffced51d3348ea3cc37b..96e82695a89ede3219f689bed002b7170ec8fbf4 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -280,7 +280,7 @@ URLPatternSet PermissionsData::GetEffectiveHostPermissions() const {
bool PermissionsData::HasHostPermission(const GURL& url) const {
base::AutoLock auto_lock(runtime_lock_);
return active_permissions_unsafe_->HasExplicitAccessToOrigin(url) &&
- !IsRuntimeBlockedHost(url);
+ !IsRuntimeBlockedHostUnsafe(url);
}
bool PermissionsData::HasEffectiveAccessToAllHosts() const {
@@ -412,7 +412,7 @@ bool PermissionsData::HasTabSpecificPermissionToExecuteScript(
return false;
}
-bool PermissionsData::IsRuntimeBlockedHost(const GURL& url) const {
+bool PermissionsData::IsRuntimeBlockedHostUnsafe(const GURL& url) const {
runtime_lock_.AssertAcquired();
return PolicyBlockedHostsUnsafe().MatchesURL(url) &&
!PolicyAllowedHostsUnsafe().MatchesURL(url);
@@ -431,7 +431,7 @@ PermissionsData::AccessType PermissionsData::CanRunOnPage(
return ACCESS_DENIED;
if (extension->location() != Manifest::COMPONENT &&
- extension->permissions_data()->IsRuntimeBlockedHost(document_url)) {
+ extension->permissions_data()->IsRuntimeBlockedHostUnsafe(document_url)) {
if (error)
*error = extension_misc::kPolicyBlockedScripting;
return ACCESS_DENIED;
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698