Add more guards around null notification
This commit is contained in:
parent
ee4442f964
commit
0a5f7171d4
2 changed files with 9 additions and 7 deletions
|
@ -57,8 +57,9 @@ void CocoaNotification::Show(const base::string16& title,
|
|||
}
|
||||
|
||||
void CocoaNotification::Dismiss() {
|
||||
[NSUserNotificationCenter.defaultUserNotificationCenter
|
||||
removeDeliveredNotification:notification_];
|
||||
if (notification_)
|
||||
[NSUserNotificationCenter.defaultUserNotificationCenter
|
||||
removeDeliveredNotification:notification_];
|
||||
NotificationDismissed();
|
||||
}
|
||||
|
||||
|
|
|
@ -26,12 +26,13 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
|
|||
const content::PlatformNotificationData& data,
|
||||
bool audio_muted,
|
||||
bool allowed) {
|
||||
if (!allowed) {
|
||||
notification->Destroy();
|
||||
if (!notification)
|
||||
return;
|
||||
}
|
||||
notification->Show(data.title, data.body, data.tag, data.icon, icon,
|
||||
audio_muted ? true : data.silent);
|
||||
if (allowed)
|
||||
notification->Show(data.title, data.body, data.tag, data.icon, icon,
|
||||
audio_muted ? true : data.silent);
|
||||
else
|
||||
notification->Destroy();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
|
Loading…
Reference in a new issue