| 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 82beef52a6cae031234447b15f9bac10de35dd5b..0aa78dfb1ba35b604e2835dc7f7afd9969084600 100644
|
| --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
|
| @@ -64,13 +64,13 @@ void RecordDeliveryStatus(content::PushDeliveryStatus status) {
|
| }
|
|
|
| blink::WebPushPermissionStatus ToPushPermission(
|
| - content::PermissionStatus permission_status) {
|
| + permission::Status permission_status) {
|
| switch (permission_status) {
|
| - case content::PERMISSION_STATUS_GRANTED:
|
| + case permission::STATUS_GRANTED:
|
| return blink::WebPushPermissionStatusGranted;
|
| - case content::PERMISSION_STATUS_DENIED:
|
| + case permission::STATUS_DENIED:
|
| return blink::WebPushPermissionStatusDenied;
|
| - case content::PERMISSION_STATUS_ASK:
|
| + case permission::STATUS_ASK:
|
| return blink::WebPushPermissionStatusPrompt;
|
| default:
|
| NOTREACHED();
|
| @@ -517,8 +517,8 @@ void PushMessagingServiceImpl::DidRequestPermission(
|
| const PushMessagingAppIdentifier& app_identifier,
|
| const std::string& sender_id,
|
| const content::PushMessagingService::RegisterCallback& register_callback,
|
| - content::PermissionStatus permission_status) {
|
| - if (permission_status != content::PERMISSION_STATUS_GRANTED) {
|
| + permission::Status permission_status) {
|
| + if (permission_status != permission::STATUS_GRANTED) {
|
| SubscribeEndWithError(register_callback,
|
| content::PUSH_REGISTRATION_STATUS_PERMISSION_DENIED);
|
| return;
|
|
|