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 8ce7f18b287fe0885a835bc862d313c02bbf2370..ed7e78a653d77828a978f4a7981900af2bd3464b 100644 |
| --- a/chrome/browser/permissions/permission_context_base.cc |
| +++ b/chrome/browser/permissions/permission_context_base.cc |
| @@ -36,7 +36,6 @@ |
| // static |
| const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] = |
| "PermissionsKillSwitch"; |
| -// static |
|
raymes
2016/08/06 00:50:21
nit: probably leave this // static as I think it i
dominickn
2016/08/08 02:18:28
Done.
|
| const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] = |
| "blocked"; |
| @@ -233,6 +232,15 @@ void PermissionContextBase::PermissionDecided( |
| } |
| #endif |
| + // Check if we should convert a dismiss decision into a block decision. This |
| + // is gated on enabling the kBlockPromptsIfDismissedOften feature. |
| + if (!persist && |
| + decision_auto_blocker_.Get().ShouldChangeDismissalToBlock( |
| + profile_, requesting_origin, permission_type_)) { |
| + persist = true; |
| + content_setting = CONTENT_SETTING_BLOCK; |
| + } |
| + |
| NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
| persist, content_setting); |
| } |