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

Store weak ref to Notification in ToastEventHandler

Browse source
This commit is contained in:
Cheng Zhao 2016-04-15 16:14:13 +09:00
parent ddee77fae4
commit f4c27c6d29
9 changed files with 32 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

21
brightray/browser/win/windows_toast_notification.cc
View file

@ -117,7 +117,7 @@ void WindowsToastNotification::Show(
return;
}
if (FAILED(SetupCallbacks(toast_notification_.Get()))) {
if (!SetupCallbacks(toast_notification_.Get())) {
NotificationFailed();
return;
}
@ -134,21 +134,6 @@ void WindowsToastNotification::Dismiss() {
toast_notifier_->Hide(toast_notification_.Get());
}
void WindowsToastNotification::NotificationClicked() {
delegate()->NotificationClick();
Destroy();
}
void WindowsToastNotification::NotificationDismissed() {
delegate()->NotificationClosed();
Destroy();
}
void WindowsToastNotification::NotificationFailed() {
delegate()->NotificationFailed();
Destroy();
}
bool WindowsToastNotification::GetToastXml(
ABI::Windows::UI::Notifications::IToastNotificationManagerStatics* toastManager,
const std::wstring& title,
@ -390,8 +375,8 @@ bool WindowsToastNotification::RemoveCallbacks(
/*
/ Toast Event Handler
*/
ToastEventHandler::ToastEventHandler(WindowsToastNotification* notification)
: notification_(notification) {
ToastEventHandler::ToastEventHandler(Notification* notification)
: notification_(notification->GetWeakPtr()) {
}
ToastEventHandler::~ToastEventHandler() {

8
brightray/browser/win/windows_toast_notification.h
View file

@ -50,10 +50,6 @@ class WindowsToastNotification : public Notification {
private:
friend class ToastEventHandler;
void NotificationClicked();
void NotificationDismissed();
void NotificationFailed();
bool GetToastXml(ABI::Windows::UI::Notifications::IToastNotificationManagerStatics* toastManager,
const std::wstring& title,
const std::wstring& msg,
@ -97,7 +93,7 @@ class ToastEventHandler : public RuntimeClass<RuntimeClassFlags<ClassicCom>,
DesktopToastDismissedEventHandler,
DesktopToastFailedEventHandler> {
public:
ToastEventHandler(WindowsToastNotification* notification);
ToastEventHandler(Notification* notification);
~ToastEventHandler();
IFACEMETHODIMP Invoke(ABI::Windows::UI::Notifications::IToastNotification* sender, IInspectable* args);
@ -105,7 +101,7 @@ class ToastEventHandler : public RuntimeClass<RuntimeClassFlags<ClassicCom>,
IFACEMETHODIMP Invoke(ABI::Windows::UI::Notifications::IToastNotification* sender, ABI::Windows::UI::Notifications::IToastFailedEventArgs* e);
private:
WindowsToastNotification* notification_; // weak ref.
base::WeakPtr<Notification> notification_; // weak ref.
DISALLOW_COPY_AND_ASSIGN(ToastEventHandler);
};