Chromium Code Reviews| Index: chrome/browser/content_settings/permission_context_base.cc |
| diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc |
| index 921170389d4488a9799c7d735f698ab18f85f0ad..df0e058f617122f4c8b211dad5077f40ce9f23f7 100644 |
| --- a/chrome/browser/content_settings/permission_context_base.cc |
| +++ b/chrome/browser/content_settings/permission_context_base.cc |
| @@ -54,6 +54,17 @@ ContentSetting PermissionContextBase::GetPermissionStatus( |
| requesting_origin, embedding_origin, permission_type_, std::string()); |
| } |
| +ContentSetting PermissionContextBase::RevokePermission( |
| + const GURL& requesting_origin, |
| + const GURL& embedding_origin) { |
| + profile_->GetHostContentSettingsMap()->SetContentSetting( |
| + ContentSettingsPattern::FromURLNoWildcard(requesting_origin), |
| + ContentSettingsPattern::FromURLNoWildcard(embedding_origin), |
| + permission_type_, std::string(), CONTENT_SETTING_DEFAULT); |
|
mlamouri (slow - plz ping)
2014/12/19 13:08:03
We should make sure that it goes back to CONTENT_S
timvolodine
2015/01/22 19:37:01
Done.
|
| + |
| + return GetPermissionStatus(requesting_origin, embedding_origin); |
| +} |
| + |
| void PermissionContextBase::CancelPermissionRequest( |
| content::WebContents* web_contents, |
| const PermissionRequestID& id) { |
| @@ -198,7 +209,7 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, |
| DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); |
| DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); |
| ContentSetting content_setting = |
| - allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; |
| + allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; |
| profile_->GetHostContentSettingsMap()->SetContentSetting( |
| ContentSettingsPattern::FromURLNoWildcard(requesting_origin), |
| ContentSettingsPattern::FromURLNoWildcard(embedding_origin), |