| Index: content/renderer/notification_permission_dispatcher.cc
|
| diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc
|
| index 5d170fb2f69d6fa7e45bb6adecad2f6b2d291d34..f4ce9d40c87fedb2d96dae0fdb4ff7eb305cf678 100644
|
| --- a/content/renderer/notification_permission_dispatcher.cc
|
| +++ b/content/renderer/notification_permission_dispatcher.cc
|
| @@ -36,7 +36,7 @@ void NotificationPermissionDispatcher::RequestPermission(
|
| // base::Unretained is safe here because the Mojo channel, with associated
|
| // callbacks, will be deleted before the "this" instance is deleted.
|
| permission_service_->RequestPermission(
|
| - PermissionName::NOTIFICATIONS, origin.toString().utf8(),
|
| + blink::mojom::PermissionName::NOTIFICATIONS, origin.toString().utf8(),
|
| base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
|
| base::Unretained(this),
|
| base::Passed(std::move(owned_callback))));
|
| @@ -44,19 +44,19 @@ void NotificationPermissionDispatcher::RequestPermission(
|
|
|
| void NotificationPermissionDispatcher::OnPermissionRequestComplete(
|
| scoped_ptr<WebNotificationPermissionCallback> callback,
|
| - PermissionStatus status) {
|
| + blink::mojom::PermissionStatus status) {
|
| DCHECK(callback);
|
|
|
| blink::WebNotificationPermission permission =
|
| blink::WebNotificationPermissionDefault;
|
| switch (status) {
|
| - case PermissionStatus::GRANTED:
|
| + case blink::mojom::PermissionStatus::GRANTED:
|
| permission = blink::WebNotificationPermissionAllowed;
|
| break;
|
| - case PermissionStatus::DENIED:
|
| + case blink::mojom::PermissionStatus::DENIED:
|
| permission = blink::WebNotificationPermissionDenied;
|
| break;
|
| - case PermissionStatus::ASK:
|
| + case blink::mojom::PermissionStatus::ASK:
|
| permission = blink::WebNotificationPermissionDefault;
|
| break;
|
| }
|
|
|