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 45ce75a0411c18d31d177a7b6d126e7ac54eedf4..0524eaea4f35f993a8bf9282d5884dbeeeed0927 100644 |
--- a/chrome/browser/content_settings/permission_context_base.cc |
+++ b/chrome/browser/content_settings/permission_context_base.cc |
@@ -55,6 +55,15 @@ ContentSetting PermissionContextBase::GetPermissionStatus( |
requesting_origin, embedding_origin, permission_type_, std::string()); |
} |
+void PermissionContextBase::ResetPermission( |
+ 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); |
+} |
+ |
void PermissionContextBase::CancelPermissionRequest( |
content::WebContents* web_contents, |
const PermissionRequestID& id) { |
@@ -212,7 +221,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; |
mlamouri (slow - plz ping)
2015/01/26 10:38:17
nit: I don't think you meant to do that change, yo
timvolodine
2015/01/30 14:07:46
Done.
|
profile_->GetHostContentSettingsMap()->SetContentSetting( |
ContentSettingsPattern::FromURLNoWildcard(requesting_origin), |
ContentSettingsPattern::FromURLNoWildcard(embedding_origin), |