| Index: chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| index 6125f3ebfd3ab245f66518fa08ef6a867994c06e..2214145796414bc0fb034c4676e9481b72b71bf5 100644
|
| --- a/chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| +++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc
|
| @@ -53,12 +53,15 @@ ContentSetting PushMessagingPermissionContext::GetPermissionStatus(
|
| push_content_setting == CONTENT_SETTING_BLOCK) {
|
| return CONTENT_SETTING_BLOCK;
|
| }
|
| - if (notifications_permission == CONTENT_SETTING_ASK ||
|
| - push_content_setting == CONTENT_SETTING_ASK) {
|
| + if (notifications_permission == CONTENT_SETTING_ASK)
|
| return CONTENT_SETTING_ASK;
|
| - }
|
| - DCHECK_EQ(CONTENT_SETTING_ALLOW, notifications_permission);
|
| - DCHECK_EQ(CONTENT_SETTING_ALLOW, push_content_setting);
|
| +
|
| + DCHECK(push_content_setting == CONTENT_SETTING_ALLOW ||
|
| + push_content_setting == CONTENT_SETTING_ASK);
|
| +
|
| + // If the notifications permission has already been granted,
|
| + // and the push permission isn't explicitly blocked, then grant
|
| + // allow permission.
|
| return CONTENT_SETTING_ALLOW;
|
| #else
|
| return CONTENT_SETTING_BLOCK;
|
|
|