| Index: content/renderer/notification_permission_dispatcher.cc
|
| diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc
|
| index bb07048e52e422fa62f381ad3a8e4bc146ca2b35..2206f876fe8b5b02595b0b0f42eb2360aaaa5419 100644
|
| --- a/content/renderer/notification_permission_dispatcher.cc
|
| +++ b/content/renderer/notification_permission_dispatcher.cc
|
| @@ -7,11 +7,11 @@
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| +#include "components/permissions/permission_status.mojom.h"
|
| #include "content/public/common/service_registry.h"
|
| #include "content/public/renderer/render_frame.h"
|
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| -#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
|
| #include "third_party/WebKit/public/web/modules/notifications/WebNotificationPermissionCallback.h"
|
|
|
| using blink::WebNotificationPermissionCallback;
|
| @@ -37,7 +37,8 @@ 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(
|
| - blink::mojom::PermissionName::NOTIFICATIONS, origin.toString().utf8(),
|
| + permissions::mojom::PermissionName::NOTIFICATIONS,
|
| + origin.toString().utf8(),
|
| base::Bind(&NotificationPermissionDispatcher::OnPermissionRequestComplete,
|
| base::Unretained(this),
|
| base::Passed(std::move(owned_callback))));
|
| @@ -45,7 +46,7 @@ void NotificationPermissionDispatcher::RequestPermission(
|
|
|
| void NotificationPermissionDispatcher::OnPermissionRequestComplete(
|
| std::unique_ptr<WebNotificationPermissionCallback> callback,
|
| - blink::mojom::PermissionStatus status) {
|
| + permissions::mojom::PermissionStatus status) {
|
| DCHECK(callback);
|
|
|
| callback->permissionRequestComplete(status);
|
|
|