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

Unified Diff: chrome/browser/permissions/permission_context_base.cc

Issue 2439673004: Add threadsafe version of PermissionManager::GetPermissionStatus (Closed)
Patch Set: Use thread_bundle_ REAL_IO_THREAD to ensure multi-thread testing Created 4 years, 2 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/permissions/permission_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index 85744db632eeddf5e4316084ec4f66adb5adc5da..6719a923c6da49f0d7374c0cccc9fd104ff5ead8 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -122,9 +122,9 @@ void PermissionContextBase::RequestPermission(
}
ContentSetting PermissionContextBase::GetPermissionStatus(
+ HostContentSettingsMap* host,
const GURL& requesting_origin,
const GURL& embedding_origin) const {
-
// If the permission has been disabled through Finch, block all requests.
if (IsPermissionKillSwitchOn())
return CONTENT_SETTING_BLOCK;
@@ -134,9 +134,16 @@ ContentSetting PermissionContextBase::GetPermissionStatus(
return CONTENT_SETTING_BLOCK;
}
- return HostContentSettingsMapFactory::GetForProfile(profile_)
- ->GetContentSetting(requesting_origin, embedding_origin,
- content_settings_type_, std::string());
+ return host->GetContentSetting(requesting_origin, embedding_origin,
+ content_settings_type_, std::string());
+}
+
+ContentSetting PermissionContextBase::GetPermissionStatus(
+ const GURL& requesting_origin,
+ const GURL& embedding_origin) const {
+ HostContentSettingsMap* host =
+ HostContentSettingsMapFactory::GetForProfile(profile_);
+ return GetPermissionStatus(host, requesting_origin, embedding_origin);
}
void PermissionContextBase::ResetPermission(

Powered by Google App Engine
This is Rietveld 408576698