content/renderer/notification_permission_dispatcher.cc - Issue 1898153002: Migrate notifications to use the PermissionStatus enum

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: content/renderer/notification_permission_dispatcher.cc

Issue 1898153002: Migrate notifications to use the PermissionStatus enum (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix type traits conflicts Created 4 years, 8 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 | « content/public/common/common_param_traits_macros.h ('k') | content/shell/browser/layout_test/layout_test_notification_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/notification_permission_dispatcher.cc

diff --git a/content/renderer/notification_permission_dispatcher.cc b/content/renderer/notification_permission_dispatcher.cc

index 110afc0810083578b2734472ce2c93b1ac88a4d6..bb07048e52e422fa62f381ad3a8e4bc146ca2b35 100644

--- a/content/renderer/notification_permission_dispatcher.cc

+++ b/content/renderer/notification_permission_dispatcher.cc

@@ -11,6 +11,7 @@

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

@@ -47,21 +48,7 @@ void NotificationPermissionDispatcher::OnPermissionRequestComplete(

blink::mojom::PermissionStatus status) {

DCHECK(callback);

- blink::WebNotificationPermission permission =

- blink::WebNotificationPermissionDefault;

- switch (status) {

- case blink::mojom::PermissionStatus::GRANTED:

- permission = blink::WebNotificationPermissionAllowed;

- break;

- case blink::mojom::PermissionStatus::DENIED:

- permission = blink::WebNotificationPermissionDenied;

- break;

- case blink::mojom::PermissionStatus::ASK:

- permission = blink::WebNotificationPermissionDefault;

- break;

- }

- callback->permissionRequestComplete(permission);

+ callback->permissionRequestComplete(status);

}

} // namespace content