Index: third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
diff --git a/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp b/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
index fe37c7ce639a5910a72d2531b304abcb10d5ed93..60a1ee2511224d69d15843a636c05caa91567baf 100644 |
--- a/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
+++ b/third_party/WebKit/Source/modules/notifications/NotificationManager.cpp |
@@ -8,7 +8,7 @@ |
#include "bindings/core/v8/ScriptState.h" |
#include "modules/notifications/Notification.h" |
#include "modules/notifications/NotificationPermissionCallback.h" |
-#include "modules/permissions/Permissions.h" |
+#include "modules/permissions/PermissionUtils.h" |
#include "platform/UserGestureIndicator.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "public/platform/InterfaceProvider.h" |
@@ -66,7 +66,7 @@ ScriptPromise NotificationManager::requestPermission(ScriptState* scriptState, N |
ExecutionContext* context = scriptState->getExecutionContext(); |
if (!m_permissionService) { |
- Permissions::connectToService(context, mojo::GetProxy(&m_permissionService)); |
+ connectToPermissionService(context, mojo::GetProxy(&m_permissionService)); |
m_permissionService.set_connection_error_handler(convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionServiceConnectionError, wrapWeakPersistent(this)))); |
} |
@@ -74,7 +74,7 @@ ScriptPromise NotificationManager::requestPermission(ScriptState* scriptState, N |
ScriptPromise promise = resolver->promise(); |
m_permissionService->RequestPermission( |
- mojom::blink::PermissionName::NOTIFICATIONS, context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(), |
+ createPermissionDescriptor(mojom::blink::PermissionName::NOTIFICATIONS), context->getSecurityOrigin(), UserGestureIndicator::processingUserGesture(), |
convertToBaseCallback(WTF::bind(&NotificationManager::onPermissionRequestComplete, wrapPersistent(this), wrapPersistent(resolver), wrapPersistent(deprecatedCallback)))); |
return promise; |