mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Don't fire the show event until the notification is actually shown

Browse source
This commit is contained in:
Adam Roben 2013-03-29 08:59:21 -04:00
parent e592f3ffa1
commit c1463f9799
1 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
brightray/browser/notification_presenter_mac.mm
View file

@ -13,6 +13,16 @@ namespace brightray {
namespace { namespace {
struct NotificationID {
int render_process_id;
int render_view_id;
int notification_id;
};
NSString * const kRenderProcessIDKey = @"RenderProcessID";
NSString * const kRenderViewIDKey = @"RenderViewID";
NSString * const kNotificationIDKey = @"NotificationID";
scoped_nsobject<NSUserNotification> CreateUserNotification( scoped_nsobject<NSUserNotification> CreateUserNotification(
const content::ShowDesktopNotificationHostMsgParams& params, const content::ShowDesktopNotificationHostMsgParams& params,
int render_process_id, int render_process_id,
@ -20,9 +30,23 @@ scoped_nsobject<NSUserNotification> CreateUserNotification(
auto notification = [[NSUserNotification alloc] init]; auto notification = [[NSUserNotification alloc] init];
notification.title = base::SysUTF16ToNSString(params.title); notification.title = base::SysUTF16ToNSString(params.title);
notification.informativeText = base::SysUTF16ToNSString(params.body); notification.informativeText = base::SysUTF16ToNSString(params.body);
notification.userInfo = @{
kRenderProcessIDKey: @(render_process_id),
kRenderViewIDKey: @(render_view_id),
kNotificationIDKey: @(params.notification_id),
};
return scoped_nsobject<NSUserNotification>(notification); return scoped_nsobject<NSUserNotification>(notification);
} }
NotificationID GetID(NSUserNotification* notification) {
NotificationID ID;
ID.render_process_id = [[notification.userInfo objectForKey:kRenderProcessIDKey] intValue];
ID.render_view_id = [[notification.userInfo objectForKey:kRenderViewIDKey] intValue];
ID.notification_id = [[notification.userInfo objectForKey:kNotificationIDKey] intValue];
return ID;
}
} }
NotificationPresenter* NotificationPresenter::Create() { NotificationPresenter* NotificationPresenter::Create() {
@ -43,18 +67,22 @@ void NotificationPresenterMac::ShowNotification(
int render_view_id) { int render_view_id) {
auto notification = CreateUserNotification(params, render_process_id, render_view_id); auto notification = CreateUserNotification(params, render_process_id, render_view_id);
[NSUserNotificationCenter.defaultUserNotificationCenter deliverNotification:notification]; [NSUserNotificationCenter.defaultUserNotificationCenter deliverNotification:notification];
auto host = content::RenderViewHost::FromID(render_process_id, render_view_id);
if (!host)
return;
host->DesktopNotificationPostDisplay(params.notification_id);
} }
} }
@implementation BRYUserNotificationCenterDelegate @implementation BRYUserNotificationCenterDelegate
- (void)userNotificationCenter:(NSUserNotificationCenter *)center didDeliverNotification:(NSUserNotification *)notification {
auto ID = brightray::GetID(notification);
auto host = content::RenderViewHost::FromID(ID.render_process_id, ID.render_view_id);
if (!host)
return;
host->DesktopNotificationPostDisplay(ID.notification_id);
}
- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification { - (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification {
// Display notifications even if the app is active. // Display notifications even if the app is active.
return YES; return YES;