Chromium Code Reviews| 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 = |
|
mlamouri (slow - plz ping)
2016/10/22 11:36:38
If that method needs to be called from the UI thre
|
| + HostContentSettingsMapFactory::GetForProfile(profile_); |
| + return GetPermissionStatus(host, requesting_origin, embedding_origin); |
| } |
| void PermissionContextBase::ResetPermission( |