chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm - Issue 2423633003: Reland of Implement support for closing mac native notifications

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: chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

Issue 2423633003: Reland of Implement support for closing mac native notifications (Closed)

Patch Set: 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 | « chrome/browser/notifications/notification_platform_bridge_mac.mm ('k') | chrome/browser/ui/cocoa/notifications/notification_response_builder_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

diff --git a/chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm b/chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

index c773dc5404d75f2cd370dd6b28e8bc1302665550..fd582a93865e62652e0af8baa22b7dee079a431c 100644

--- a/chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

+++ b/chrome/browser/ui/cocoa/notifications/notification_response_builder_mac.mm

@@ -46,9 +46,11 @@

NSNumber* notificationType = [[notification userInfo]

objectForKey:notification_constants::kNotificationType];

- // Initialize operation and button index for the case where the

- // notification itself was clicked.

- NotificationOperation operation = NOTIFICATION_CLICK;

+ // Closed notifications are not activated.

+ NotificationOperation operation =

+ notification.activationType == NSUserNotificationActivationTypeNone

+ ? NOTIFICATION_CLOSE

+ : NOTIFICATION_CLICK;

int buttonIndex = -1;

// Determine whether the user clicked on a button, and if they did, whether it