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

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

Issue 890083002: [Extensions] Propagate activeTab hosts to extension background pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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') | extensions/extensions.gyp » ('j') | 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 af405273e3a698f644adf8ee081b235f57ed0ffb..d0c0f47f859c3a0c826c60a4972f05f1976f40fb 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -170,8 +170,12 @@ bool PermissionsData::CheckAPIPermissionWithParam(
return active_permissions()->CheckAPIPermissionWithParam(permission, param);
}
-const URLPatternSet& PermissionsData::GetEffectiveHostPermissions() const {
- return active_permissions()->effective_hosts();
+URLPatternSet PermissionsData::GetEffectiveHostPermissions() const {
+ base::AutoLock auto_lock(runtime_lock_);
+ URLPatternSet effective_hosts = active_permissions_unsafe_->effective_hosts();
+ for (const auto& val : tab_specific_permissions_)
+ effective_hosts.AddPatterns(val.second->effective_hosts());
+ return effective_hosts;
}
bool PermissionsData::HasHostPermission(const GURL& url) const {
« no previous file with comments | « extensions/common/permissions/permissions_data.h ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698