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

Unified Diff: chrome/browser/extensions/extension_management.cc

Issue 2833843004: Reland: Communicate ExtensionSettings policy to renderers (Closed)
Patch Set: Removed unused URLPatternSet parameters in ExtensionMsg_PermissionSetStruct which was causing MSAN … Created 3 years, 8 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
Index: chrome/browser/extensions/extension_management.cc
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index c564797fb9c6a8b9a6f01aa4018ed57b7600624d..559efe8a47261d2dd2f453e28cfaa573d75e5781 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -198,6 +198,16 @@ APIPermissionSet ExtensionManagement::GetBlockedAPIPermissions(
return default_settings_->blocked_permissions;
}
+const URLPatternSet& ExtensionManagement::GetDefaultRuntimeBlockedHosts()
+ const {
+ return default_settings_->runtime_blocked_hosts;
+}
+
+const URLPatternSet& ExtensionManagement::GetDefaultRuntimeAllowedHosts()
+ const {
+ return default_settings_->runtime_allowed_hosts;
+}
+
const URLPatternSet& ExtensionManagement::GetRuntimeBlockedHosts(
const Extension* extension) const {
auto iter_id = settings_by_id_.find(extension->id());
@@ -214,8 +224,13 @@ const URLPatternSet& ExtensionManagement::GetRuntimeAllowedHosts(
return default_settings_->runtime_allowed_hosts;
}
-bool ExtensionManagement::IsBlockedHost(const Extension* extension,
- const GURL& url) const {
+bool ExtensionManagement::UsesDefaultRuntimeHostRestrictions(
+ const Extension* extension) const {
+ return settings_by_id_.find(extension->id()) == settings_by_id_.end();
+}
+
+bool ExtensionManagement::IsRuntimeBlockedHost(const Extension* extension,
+ const GURL& url) const {
auto iter_id = settings_by_id_.find(extension->id());
if (iter_id != settings_by_id_.end())
return iter_id->second->runtime_blocked_hosts.MatchesURL(url);
« no previous file with comments | « chrome/browser/extensions/extension_management.h ('k') | chrome/browser/extensions/extension_management_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698