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

Merge pull request #258 from deepak1556/notification_close_patch

Browse source 
set notification close callback before requesting user permission
This commit is contained in:
Kevin Sawicki 2016-10-31 09:01:57 -07:00 • committed by GitHub
commit 487287eb1d
4 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
brightray/browser/linux/libnotify_notification.cc
View file

@ -82,8 +82,10 @@ LibnotifyNotification::LibnotifyNotification(NotificationDelegate* delegate,
} }
LibnotifyNotification::~LibnotifyNotification() { LibnotifyNotification::~LibnotifyNotification() {
g_signal_handlers_disconnect_by_data(notification_, this); if (notification_) {
g_object_unref(notification_); g_signal_handlers_disconnect_by_data(notification_, this);
g_object_unref(notification_);
}
} }
void LibnotifyNotification::Show(const base::string16& title, void LibnotifyNotification::Show(const base::string16& title,
@ -144,6 +146,11 @@ void LibnotifyNotification::Show(const base::string16& title,
} }
void LibnotifyNotification::Dismiss() { void LibnotifyNotification::Dismiss() {
if (!notification_) {
Destroy();
return;
}
GError* error = nullptr; GError* error = nullptr;
libnotify_loader_.notify_notification_close(notification_, &error); libnotify_loader_.notify_notification_close(notification_, &error);
if (error) { if (error) {

10
brightray/browser/mac/cocoa_notification.mm
View file

@ -24,8 +24,9 @@ CocoaNotification::CocoaNotification(NotificationDelegate* delegate,
} }
CocoaNotification::~CocoaNotification() { CocoaNotification::~CocoaNotification() {
[NSUserNotificationCenter.defaultUserNotificationCenter if (notification_)
removeDeliveredNotification:notification_]; [NSUserNotificationCenter.defaultUserNotificationCenter
removeDeliveredNotification:notification_];
} }
void CocoaNotification::Show(const base::string16& title, void CocoaNotification::Show(const base::string16& title,
@ -56,8 +57,9 @@ void CocoaNotification::Show(const base::string16& title,
} }
void CocoaNotification::Dismiss() { void CocoaNotification::Dismiss() {
[NSUserNotificationCenter.defaultUserNotificationCenter if (notification_)
removeDeliveredNotification:notification_]; [NSUserNotificationCenter.defaultUserNotificationCenter
removeDeliveredNotification:notification_];
NotificationDismissed(); NotificationDismissed();
} }

6
brightray/browser/notification.h
View file

@ -34,6 +34,9 @@ class Notification {
void NotificationDismissed(); void NotificationDismissed();
void NotificationFailed(); void NotificationFailed();
// delete this.
void Destroy();
base::WeakPtr<Notification> GetWeakPtr() { base::WeakPtr<Notification> GetWeakPtr() {
return weak_factory_.GetWeakPtr(); return weak_factory_.GetWeakPtr();
} }
@ -46,9 +49,6 @@ class Notification {
NotificationPresenter* presenter); NotificationPresenter* presenter);
virtual ~Notification(); virtual ~Notification();
// delete this.
void Destroy();
private: private:
friend class NotificationPresenter; friend class NotificationPresenter;

50
brightray/browser/platform_notification_service.cc
View file

@ -21,28 +21,18 @@ void RemoveNotification(base::WeakPtr<Notification> notification) {
notification->Dismiss(); notification->Dismiss();
} }
void OnWebNotificationAllowed( void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
brightray::BrowserClient* browser_client, const SkBitmap& icon,
const SkBitmap& icon, const content::PlatformNotificationData& data,
const content::PlatformNotificationData& data, bool audio_muted,
std::unique_ptr<content::DesktopNotificationDelegate> delegate, bool allowed) {
base::Closure* cancel_callback, if (!notification)
bool audio_muted,
bool allowed) {
if (!allowed)
return; return;
auto presenter = browser_client->GetNotificationPresenter(); if (allowed)
if (!presenter)
return;
std::unique_ptr<NotificationDelegateAdapter> adapter(
new NotificationDelegateAdapter(std::move(delegate)));
auto notification = presenter->CreateNotification(adapter.get());
if (notification) {
ignore_result(adapter.release()); // it will release itself automatically.
notification->Show(data.title, data.body, data.tag, data.icon, icon, notification->Show(data.title, data.body, data.tag, data.icon, icon,
audio_muted ? true : data.silent); audio_muted ? true : data.silent);
*cancel_callback = base::Bind(&RemoveNotification, notification); else
} notification->Destroy();
} }
} // namespace } // namespace
@ -77,14 +67,20 @@ void PlatformNotificationService::DisplayNotification(
const content::NotificationResources& notification_resources, const content::NotificationResources& notification_resources,
std::unique_ptr<content::DesktopNotificationDelegate> delegate, std::unique_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) { base::Closure* cancel_callback) {
browser_client_->WebNotificationAllowed( auto presenter = browser_client_->GetNotificationPresenter();
render_process_id_, if (!presenter)
base::Bind(&OnWebNotificationAllowed, return;
browser_client_, std::unique_ptr<NotificationDelegateAdapter> adapter(
notification_resources.notification_icon, new NotificationDelegateAdapter(std::move(delegate)));
notification_data, auto notification = presenter->CreateNotification(adapter.get());
base::Passed(&delegate), if (notification) {
cancel_callback)); ignore_result(adapter.release()); // it will release itself automatically.
*cancel_callback = base::Bind(&RemoveNotification, notification);
browser_client_->WebNotificationAllowed(
render_process_id_, base::Bind(&OnWebNotificationAllowed, notification,
notification_resources.notification_icon,
notification_data));
}
} }
void PlatformNotificationService::DisplayPersistentNotification( void PlatformNotificationService::DisplayPersistentNotification(