| Index: content/renderer/notification_permission_dispatcher.cc
|
| diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc
|
| index 90eef27cf7787f650bbbe87a4e7910ba8acad42a..a510515884c92e54237aba3c4886a3d24695febb 100644
|
| --- a/content/renderer/notification_permission_dispatcher.cc
|
| +++ b/content/renderer/notification_permission_dispatcher.cc
|
| @@ -32,16 +32,15 @@ void NotificationPermissionDispatcher::RequestPermission(
|
| int request_id = pending_requests_.Add(callback);
|
|
|
| permission_service_->RequestPermission(
|
| - PERMISSION_NAME_NOTIFICATIONS,
|
| - origin.toString().utf8(),
|
| + permission::NAME_NOTIFICATIONS, origin.toString().utf8(),
|
| blink::WebUserGestureIndicator::isProcessingUserGesture(),
|
| base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
|
| - base::Unretained(this),
|
| - request_id));
|
| + base::Unretained(this), request_id));
|
| }
|
|
|
| void NotificationPermissionDispatcher::OnPermissionRequestComplete(
|
| - int request_id, PermissionStatus status) {
|
| + int request_id,
|
| + permission::Status status) {
|
| blink::WebNotificationPermissionCallback* callback =
|
| pending_requests_.Lookup(request_id);
|
| DCHECK(callback);
|
| @@ -49,13 +48,13 @@ void NotificationPermissionDispatcher::OnPermissionRequestComplete(
|
| blink::WebNotificationPermission permission =
|
| blink::WebNotificationPermissionDefault;
|
| switch (status) {
|
| - case PERMISSION_STATUS_GRANTED:
|
| + case permission::STATUS_GRANTED:
|
| permission = blink::WebNotificationPermissionAllowed;
|
| break;
|
| - case PERMISSION_STATUS_DENIED:
|
| + case permission::STATUS_DENIED:
|
| permission = blink::WebNotificationPermissionDenied;
|
| break;
|
| - case PERMISSION_STATUS_ASK:
|
| + case permission::STATUS_ASK:
|
| permission = blink::WebNotificationPermissionDefault;
|
| break;
|
| }
|
|
|