third_party/WebKit/Source/modules/notifications/NotificationManager.cpp - Issue 2255933002: Add PermissionDescriptor to the permissions Mojo interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/notifications/NotificationManager.cpp

Issue 2255933002: Add PermissionDescriptor to the permissions Mojo interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no_notification_dispatcher

Patch Set: Print the unexpected permission type. Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/geolocation/Geolocation.cpp ('k') | third_party/WebKit/Source/modules/permissions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2f9aa14a6c0ad5f49289bd51c3ed42b88abf583b..c5b8ca30724752d6348574a47b7ee1b13118f540 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,8 +66,7 @@ ScriptPromise NotificationManager::requestPermission(

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))));

@@ -77,7 +76,8 @@ ScriptPromise NotificationManager::requestPermission(

ScriptPromise promise = resolver->promise();

m_permissionService->RequestPermission(

- mojom::blink::PermissionName::NOTIFICATIONS, context->getSecurityOrigin(),

+ createPermissionDescriptor(mojom::blink::PermissionName::NOTIFICATIONS),

+ context->getSecurityOrigin(),

UserGestureIndicator::processingUserGesture(),

convertToBaseCallback(

WTF::bind(&NotificationManager::onPermissionRequestComplete,