2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-10-05 21:24:38 +00:00
|
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
|
|
Date: Fri, 5 Oct 2018 14:22:06 -0700
|
|
|
|
Subject: pass RenderProcessHost through to PlatformNotificationService
|
|
|
|
|
|
|
|
this is so Electron can identify which renderer a notification came from
|
|
|
|
|
|
|
|
diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
|
2019-08-02 23:56:46 +00:00
|
|
|
index a717d9f3539dc0fe86b743c6e29e4311b8b5cec3..1351217319c57be414e6c66f8a01f71fe46d2c04 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/browser/notifications/blink_notification_service_impl.cc
|
|
|
|
+++ b/content/browser/notifications/blink_notification_service_impl.cc
|
2019-04-20 17:20:37 +00:00
|
|
|
@@ -88,9 +88,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
|
2018-10-05 21:24:38 +00:00
|
|
|
PlatformNotificationContextImpl* notification_context,
|
|
|
|
BrowserContext* browser_context,
|
|
|
|
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const url::Origin& origin,
|
2019-07-24 22:58:51 +00:00
|
|
|
mojo::PendingReceiver<blink::mojom::NotificationService> receiver)
|
2018-10-05 21:24:38 +00:00
|
|
|
: notification_context_(notification_context),
|
|
|
|
+ render_process_host_(render_process_host),
|
|
|
|
browser_context_(browser_context),
|
|
|
|
service_worker_context_(std::move(service_worker_context)),
|
|
|
|
origin_(origin),
|
2019-07-24 22:58:51 +00:00
|
|
|
@@ -151,8 +153,9 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
|
|
|
|
notification_id, std::move(event_listener_remote));
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2019-04-20 17:20:37 +00:00
|
|
|
GetNotificationService(browser_context_)
|
|
|
|
- ->DisplayNotification(notification_id, origin_.GetURL(),
|
|
|
|
- platform_notification_data, notification_resources);
|
|
|
|
+ ->DisplayNotification(render_process_host_, notification_id,
|
|
|
|
+ origin_.GetURL(), platform_notification_data,
|
|
|
|
+ notification_resources);
|
2018-10-05 21:24:38 +00:00
|
|
|
}
|
|
|
|
|
2019-04-20 17:20:37 +00:00
|
|
|
void BlinkNotificationServiceImpl::CloseNonPersistentNotification(
|
2018-10-05 21:24:38 +00:00
|
|
|
diff --git a/content/browser/notifications/blink_notification_service_impl.h b/content/browser/notifications/blink_notification_service_impl.h
|
2019-07-24 22:58:51 +00:00
|
|
|
index 5253f6be778cc78571b3df0a33d364a9b1e6ef52..dc5307e6500b0bfb5da83e8d8ff8886b91133522 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/browser/notifications/blink_notification_service_impl.h
|
|
|
|
+++ b/content/browser/notifications/blink_notification_service_impl.h
|
2019-07-24 22:58:51 +00:00
|
|
|
@@ -40,6 +40,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
|
2018-10-05 21:24:38 +00:00
|
|
|
PlatformNotificationContextImpl* notification_context,
|
|
|
|
BrowserContext* browser_context,
|
|
|
|
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const url::Origin& origin,
|
2019-07-24 22:58:51 +00:00
|
|
|
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
|
2018-10-05 21:24:38 +00:00
|
|
|
~BlinkNotificationServiceImpl() override;
|
2019-07-24 22:58:51 +00:00
|
|
|
@@ -99,6 +100,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
|
2018-10-05 21:24:38 +00:00
|
|
|
// The notification context that owns this service instance.
|
|
|
|
PlatformNotificationContextImpl* notification_context_;
|
|
|
|
|
|
|
|
+ RenderProcessHost* render_process_host_;
|
|
|
|
BrowserContext* browser_context_;
|
|
|
|
|
|
|
|
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
|
2018-10-11 08:38:48 +00:00
|
|
|
diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc
|
2019-07-24 22:58:51 +00:00
|
|
|
index f64eb733ede38501c34b2af89f42255189abd982..3c2dfad7ac9ba64b0b49ebef41a303edd1470cb1 100644
|
2018-10-11 08:38:48 +00:00
|
|
|
--- a/content/browser/notifications/blink_notification_service_impl_unittest.cc
|
|
|
|
+++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
|
2019-07-24 22:58:51 +00:00
|
|
|
@@ -138,7 +138,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
|
2019-01-12 01:00:43 +00:00
|
|
|
|
2018-10-11 08:38:48 +00:00
|
|
|
notification_service_ = std::make_unique<BlinkNotificationServiceImpl>(
|
|
|
|
notification_context_.get(), &browser_context_,
|
|
|
|
- embedded_worker_helper_->context_wrapper(),
|
|
|
|
+ embedded_worker_helper_->context_wrapper(), nullptr,
|
|
|
|
url::Origin::Create(GURL(kTestOrigin)),
|
2019-07-24 22:58:51 +00:00
|
|
|
notification_service_remote_.BindNewPipeAndPassReceiver());
|
2018-10-11 08:38:48 +00:00
|
|
|
|
2018-10-05 21:24:38 +00:00
|
|
|
diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc
|
2019-08-15 20:50:58 +00:00
|
|
|
index 93ae69a720d4d24b5fd11508a9f6ec3c17f559d5..93768924cf442ef4cb36addfe279852b9c0dd444 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/browser/notifications/platform_notification_context_impl.cc
|
|
|
|
+++ b/content/browser/notifications/platform_notification_context_impl.cc
|
2019-05-01 00:18:22 +00:00
|
|
|
@@ -207,12 +207,13 @@ void PlatformNotificationContextImpl::Shutdown() {
|
2018-10-05 21:24:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PlatformNotificationContextImpl::CreateService(
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const url::Origin& origin,
|
2019-07-24 22:58:51 +00:00
|
|
|
mojo::PendingReceiver<blink::mojom::NotificationService> receiver) {
|
2018-10-05 21:24:38 +00:00
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
|
services_.push_back(std::make_unique<BlinkNotificationServiceImpl>(
|
|
|
|
- this, browser_context_, service_worker_context_, origin,
|
2019-07-24 22:58:51 +00:00
|
|
|
- std::move(receiver)));
|
2018-10-05 21:24:38 +00:00
|
|
|
+ this, browser_context_, service_worker_context_, render_process_host,
|
2019-07-24 22:58:51 +00:00
|
|
|
+ origin, std::move(receiver)));
|
2018-10-05 21:24:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void PlatformNotificationContextImpl::RemoveService(
|
|
|
|
diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
|
2019-08-15 20:50:58 +00:00
|
|
|
index 4bf25bf1fa69f7d3869369172d375e2e489e62a1..f80ef2cecc8b111dc54e109646573a5978d8ea9c 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/browser/notifications/platform_notification_context_impl.h
|
|
|
|
+++ b/content/browser/notifications/platform_notification_context_impl.h
|
2019-03-21 22:45:52 +00:00
|
|
|
@@ -24,6 +24,7 @@
|
2018-10-05 21:24:38 +00:00
|
|
|
#include "content/common/content_export.h"
|
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
|
#include "content/public/browser/platform_notification_context.h"
|
|
|
|
+#include "content/public/browser/render_process_host.h"
|
2019-07-24 22:58:51 +00:00
|
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
2019-04-20 17:20:37 +00:00
|
|
|
#include "third_party/blink/public/mojom/notifications/notification_service.mojom.h"
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2019-07-24 22:58:51 +00:00
|
|
|
@@ -67,6 +68,7 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2019-02-14 16:34:15 +00:00
|
|
|
// Creates a BlinkNotificationServiceImpl that is owned by this context.
|
2019-07-24 22:58:51 +00:00
|
|
|
void CreateService(
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const url::Origin& origin,
|
|
|
|
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
|
2018-10-05 21:24:38 +00:00
|
|
|
|
|
|
|
diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
|
2019-08-15 20:50:58 +00:00
|
|
|
index 95bed38ac589bd55550704d16fa817610aead6f9..664b7dca4e9c2a09680855e9bc3864c8bd8ac4d5 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/browser/renderer_interface_binders.cc
|
|
|
|
+++ b/content/browser/renderer_interface_binders.cc
|
2019-08-15 20:50:58 +00:00
|
|
|
@@ -201,7 +201,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
|
2019-07-24 22:58:51 +00:00
|
|
|
RenderProcessHost* host, const url::Origin& origin) {
|
2018-10-05 21:24:38 +00:00
|
|
|
static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
|
|
|
|
->GetPlatformNotificationContext()
|
|
|
|
- ->CreateService(origin, std::move(request));
|
|
|
|
+ ->CreateService(host, origin, std::move(request));
|
|
|
|
}));
|
|
|
|
parameterized_binder_registry_.AddInterface(
|
2018-10-24 23:25:48 +00:00
|
|
|
base::BindRepeating(&BackgroundFetchServiceImpl::CreateForWorker));
|
2018-10-05 21:24:38 +00:00
|
|
|
diff --git a/content/public/browser/platform_notification_service.h b/content/public/browser/platform_notification_service.h
|
2019-04-20 17:20:37 +00:00
|
|
|
index ca61088079c4150fcf389504ddcf26bcf6bf69cd..d9c034c39890eef1fe3d95c6d7c0ae68eb711a89 100644
|
2018-10-05 21:24:38 +00:00
|
|
|
--- a/content/public/browser/platform_notification_service.h
|
|
|
|
+++ b/content/public/browser/platform_notification_service.h
|
2019-04-20 17:20:37 +00:00
|
|
|
@@ -27,6 +27,8 @@ struct PlatformNotificationData;
|
|
|
|
|
2018-10-05 21:24:38 +00:00
|
|
|
namespace content {
|
|
|
|
|
|
|
|
+class RenderProcessHost;
|
2019-04-20 17:20:37 +00:00
|
|
|
+
|
2019-01-12 01:00:43 +00:00
|
|
|
// The service using which notifications can be presented to the user. There
|
|
|
|
// should be a unique instance of the PlatformNotificationService depending
|
2019-04-20 17:20:37 +00:00
|
|
|
// on the browsing context being used.
|
|
|
|
@@ -41,6 +43,7 @@ class CONTENT_EXPORT PlatformNotificationService {
|
2018-10-05 21:24:38 +00:00
|
|
|
// Displays the notification described in |notification_data| to the user.
|
|
|
|
// This method must be called on the UI thread.
|
|
|
|
virtual void DisplayNotification(
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const std::string& notification_id,
|
|
|
|
const GURL& origin,
|
2019-04-20 17:20:37 +00:00
|
|
|
const blink::PlatformNotificationData& notification_data,
|
2018-10-11 08:38:48 +00:00
|
|
|
diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc
|
2019-08-15 20:50:58 +00:00
|
|
|
index ba5982883a3821b42c47c80187af2e4d1b3f0ffb..720965aa1df6b415e12a85dd2b2e4475facab019 100644
|
2018-10-11 08:38:48 +00:00
|
|
|
--- a/content/test/mock_platform_notification_service.cc
|
|
|
|
+++ b/content/test/mock_platform_notification_service.cc
|
2019-04-20 17:20:37 +00:00
|
|
|
@@ -29,6 +29,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(
|
2018-10-11 08:38:48 +00:00
|
|
|
MockPlatformNotificationService::~MockPlatformNotificationService() = default;
|
|
|
|
|
|
|
|
void MockPlatformNotificationService::DisplayNotification(
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const std::string& notification_id,
|
|
|
|
const GURL& origin,
|
2019-04-20 17:20:37 +00:00
|
|
|
const blink::PlatformNotificationData& notification_data,
|
2018-10-11 08:38:48 +00:00
|
|
|
diff --git a/content/test/mock_platform_notification_service.h b/content/test/mock_platform_notification_service.h
|
2019-04-20 17:20:37 +00:00
|
|
|
index 6d108f9884f7e8f608b70ec33d286a06346e7456..4650a01c2d090c5957eb7a7e21f124489513142a 100644
|
2018-10-11 08:38:48 +00:00
|
|
|
--- a/content/test/mock_platform_notification_service.h
|
|
|
|
+++ b/content/test/mock_platform_notification_service.h
|
2019-04-20 17:20:37 +00:00
|
|
|
@@ -47,6 +47,7 @@ class MockPlatformNotificationService : public PlatformNotificationService {
|
2018-10-11 08:38:48 +00:00
|
|
|
|
|
|
|
// PlatformNotificationService implementation.
|
|
|
|
void DisplayNotification(
|
|
|
|
+ RenderProcessHost* render_process_host,
|
|
|
|
const std::string& notification_id,
|
|
|
|
const GURL& origin,
|
2019-04-20 17:20:37 +00:00
|
|
|
const blink::PlatformNotificationData& notification_data,
|