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

Sanitized notification delegate implementation

Browse source 
I made `brightray::NotificationDelegate` back into just an interface and
extracted the implementation used by `PlatformNotificationService`, so that
the main process notification implementation can inherit only the interface.
This commit is contained in:
Ales Pergl 2017-11-01 23:14:27 +01:00 • committed by Cheng Zhao
parent 8750fde6d3
commit f3c32647af
5 changed files with 56 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

33
brightray/browser/platform_notification_service.cc
View file

@ -9,6 +9,7 @@
#include "brightray/browser/notification.h"
#include "brightray/browser/notification_delegate.h"
#include "brightray/browser/notification_presenter.h"
#include "content/public/browser/notification_event_dispatcher.h"
#include "content/public/common/notification_resources.h"
#include "content/public/common/platform_notification_data.h"
#include "third_party/skia/include/core/SkBitmap.h"
@ -44,6 +45,34 @@ void OnWebNotificationAllowed(base::WeakPtr<Notification> notification,
}
}
class NotificationDelegateImpl : public brightray::NotificationDelegate {
public:
explicit NotificationDelegateImpl(const std::string& notification_id)
: notification_id_(notification_id) {}
void NotificationDestroyed() override { delete this; }
void NotificationClick() override {
content::NotificationEventDispatcher::GetInstance()
->DispatchNonPersistentClickEvent(notification_id_);
}
void NotificationClosed() override {
content::NotificationEventDispatcher::GetInstance()
->DispatchNonPersistentCloseEvent(notification_id_);
}
void NotificationDisplayed() override {
content::NotificationEventDispatcher::GetInstance()
->DispatchNonPersistentShowEvent(notification_id_);
}
private:
std::string notification_id_;
DISALLOW_COPY_AND_ASSIGN(NotificationDelegateImpl);
};
} // namespace
PlatformNotificationService::PlatformNotificationService(
@ -81,8 +110,8 @@ void PlatformNotificationService::DisplayNotification(
auto presenter = browser_client_->GetNotificationPresenter();
if (!presenter)
return;
brightray::NotificationDelegate* delegate =
new NotificationDelegate(notification_id);
NotificationDelegateImpl* delegate =
new NotificationDelegateImpl(notification_id);
auto notification = presenter->CreateNotification(delegate);
if (notification) {
*cancel_callback = base::Bind(&RemoveNotification, notification);