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

FIXME: DesktopNotificationDelegate has been removed

Browse source 
Related CL: https://codereview.chromium.org/2906883003
This commit is contained in:
Tony Ganch 2017-08-17 18:19:14 +02:00 • committed by Cheng Zhao
parent fe431a9e58
commit f694b64d71
8 changed files with 57 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

10
brightray/browser/platform_notification_service.cc
View file

@ -7,7 +7,7 @@
#include "base/strings/utf_string_conversions.h"
#include "brightray/browser/browser_client.h"
#include "brightray/browser/notification.h"
#include "brightray/browser/notification_delegate_adapter.h"
#include "brightray/browser/notification_delegate.h"
#include "brightray/browser/notification_presenter.h"
#include "content/public/common/notification_resources.h"
#include "content/public/common/platform_notification_data.h"
@ -77,16 +77,14 @@ void PlatformNotificationService::DisplayNotification(
const GURL& origin,
const content::PlatformNotificationData& notification_data,
const content::NotificationResources& notification_resources,
std::unique_ptr<content::DesktopNotificationDelegate> delegate,
base::Closure* cancel_callback) {
auto presenter = browser_client_->GetNotificationPresenter();
if (!presenter)
return;
std::unique_ptr<NotificationDelegateAdapter> adapter(
new NotificationDelegateAdapter(std::move(delegate)));
auto notification = presenter->CreateNotification(adapter.get());
brightray::NotificationDelegate* delegate =
new NotificationDelegate(notification_id);
auto notification = presenter->CreateNotification(delegate);
if (notification) {
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,