| Index: chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| index f495134d827fa2465fc3db88c320de47c44b6cd0..843397b3806dd87b66c1f4076092e3ec6933c621 100644
|
| --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| @@ -100,14 +100,16 @@ void RecordUnsubscribeIIDResult(InstanceID::Result result) {
|
| }
|
|
|
| blink::WebPushPermissionStatus ToPushPermission(
|
| - blink::mojom::PermissionStatus permission_status) {
|
| - switch (permission_status) {
|
| - case blink::mojom::PermissionStatus::GRANTED:
|
| + ContentSetting content_setting) {
|
| + switch (content_setting) {
|
| + case CONTENT_SETTING_ALLOW:
|
| return blink::WebPushPermissionStatusGranted;
|
| - case blink::mojom::PermissionStatus::DENIED:
|
| + case CONTENT_SETTING_BLOCK:
|
| return blink::WebPushPermissionStatusDenied;
|
| - case blink::mojom::PermissionStatus::ASK:
|
| + case CONTENT_SETTING_ASK:
|
| return blink::WebPushPermissionStatusPrompt;
|
| + default:
|
| + break;
|
| }
|
| NOTREACHED();
|
| return blink::WebPushPermissionStatusDenied;
|
| @@ -507,7 +509,7 @@ void PushMessagingServiceImpl::SubscribeFromWorker(
|
| }
|
|
|
| DoSubscribe(app_identifier, options, register_callback,
|
| - blink::mojom::PermissionStatus::GRANTED);
|
| + CONTENT_SETTING_ALLOW);
|
| }
|
|
|
| blink::WebPushPermissionStatus PushMessagingServiceImpl::GetPermissionStatus(
|
| @@ -531,8 +533,8 @@ void PushMessagingServiceImpl::DoSubscribe(
|
| const PushMessagingAppIdentifier& app_identifier,
|
| const content::PushSubscriptionOptions& options,
|
| const RegisterCallback& register_callback,
|
| - blink::mojom::PermissionStatus permission_status) {
|
| - if (permission_status != blink::mojom::PermissionStatus::GRANTED) {
|
| + ContentSetting content_setting) {
|
| + if (content_setting != CONTENT_SETTING_ALLOW) {
|
| SubscribeEndWithError(register_callback,
|
| content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
|
| return;
|
|
|