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

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

Issue 2446863002: Revert of Add threadsafe version of PermissionManager::GetPermissionStatus (Closed)
Patch Set: 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 6719a923c6da49f0d7374c0cccc9fd104ff5ead8..85744db632eeddf5e4316084ec4f66adb5adc5da 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -122,9 +122,9 @@
}
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,16 +134,9 @@
return CONTENT_SETTING_BLOCK;
}
- 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);
+ return HostContentSettingsMapFactory::GetForProfile(profile_)
+ ->GetContentSetting(requesting_origin, embedding_origin,
+ content_settings_type_, std::string());
}
void PermissionContextBase::ResetPermission(
« no previous file with comments | « chrome/browser/permissions/permission_context_base.h ('k') | chrome/browser/permissions/permission_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698