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
|
2019-08-24 01:14:23 +00:00
|
|
|
Subject: notification_provenance.patch
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2022-01-11 19:27:24 +00:00
|
|
|
Pass RenderFrameHost through to PlatformNotificationService
|
2019-08-24 01:14:23 +00:00
|
|
|
so Electron can identify which renderer a notification came from.
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2022-01-11 19:27:24 +00:00
|
|
|
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc
|
2023-03-10 16:07:42 +00:00
|
|
|
index aa9ce8fa016317d543752462f356ccdef6b931eb..71fc184b94286803300c396fe4845e5f17911f55 100644
|
2022-01-11 19:27:24 +00:00
|
|
|
--- a/chrome/browser/notifications/platform_notification_service_impl.cc
|
|
|
|
|
+++ b/chrome/browser/notifications/platform_notification_service_impl.cc
|
2023-03-10 16:07:42 +00:00
|
|
|
@@ -200,6 +200,7 @@ bool PlatformNotificationServiceImpl::WasClosedProgrammatically(
|
2022-01-11 19:27:24 +00:00
|
|
|
|
|
|
|
|
// TODO(awdf): Rename to DisplayNonPersistentNotification (Similar for Close)
|
|
|
|
|
void PlatformNotificationServiceImpl::DisplayNotification(
|
|
|
|
|
+ content::RenderFrameHost* render_frame_host,
|
|
|
|
|
const std::string& notification_id,
|
|
|
|
|
const GURL& origin,
|
|
|
|
|
const GURL& document_url,
|
|
|
|
|
diff --git a/chrome/browser/notifications/platform_notification_service_impl.h b/chrome/browser/notifications/platform_notification_service_impl.h
|
2023-03-10 16:07:42 +00:00
|
|
|
index 380a2da617ff5e49f780f4b89d87ceefd75bb6f7..ec78a854531b7d52fbaa5de71fc5e67180fad8c8 100644
|
2022-01-11 19:27:24 +00:00
|
|
|
--- a/chrome/browser/notifications/platform_notification_service_impl.h
|
|
|
|
|
+++ b/chrome/browser/notifications/platform_notification_service_impl.h
|
|
|
|
|
@@ -56,6 +56,7 @@ class PlatformNotificationServiceImpl
|
|
|
|
|
|
|
|
|
|
// content::PlatformNotificationService implementation.
|
|
|
|
|
void DisplayNotification(
|
|
|
|
|
+ content::RenderFrameHost* render_frame_host,
|
|
|
|
|
const std::string& notification_id,
|
|
|
|
|
const GURL& origin,
|
|
|
|
|
const GURL& document_url,
|
2018-10-05 21:24:38 +00:00
|
|
|
diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
|
2023-02-03 11:43:42 +00:00
|
|
|
index 688c95eeb2a1ea60b004eb643cb5afcff48c11bd..226d1e3f01f976d8b35e6b3fbd332683d1a0f84b 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
|
2023-01-06 02:35:34 +00:00
|
|
|
@@ -87,12 +87,14 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(
|
2018-10-05 21:24:38 +00:00
|
|
|
BrowserContext* browser_context,
|
|
|
|
|
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
|
2022-04-12 11:19:14 +00:00
|
|
|
RenderProcessHost* render_process_host,
|
2021-04-29 18:23:28 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2023-01-06 02:35:34 +00:00
|
|
|
const blink::StorageKey& storage_key,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
2022-06-27 20:50:08 +00:00
|
|
|
const WeakDocumentPtr& weak_document_ptr,
|
2022-11-17 19:59:23 +00:00
|
|
|
RenderProcessHost::NotificationServiceCreatorType creator_type,
|
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),
|
2021-04-29 18:23:28 +00:00
|
|
|
+ render_frame_host_(render_frame_host),
|
2018-10-05 21:24:38 +00:00
|
|
|
browser_context_(browser_context),
|
|
|
|
|
service_worker_context_(std::move(service_worker_context)),
|
2022-04-12 11:19:14 +00:00
|
|
|
render_process_host_id_(render_process_host->GetID()),
|
2023-01-06 02:35:34 +00:00
|
|
|
@@ -184,7 +186,7 @@ void BlinkNotificationServiceImpl::DisplayNonPersistentNotification(
|
2022-11-17 19:59:23 +00:00
|
|
|
creator_type_);
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2021-10-06 02:21:00 +00:00
|
|
|
browser_context_->GetPlatformNotificationService()->DisplayNotification(
|
2023-01-06 02:35:34 +00:00
|
|
|
- notification_id, storage_key_.origin().GetURL(), document_url_,
|
|
|
|
|
+ render_frame_host_, notification_id, storage_key_.origin().GetURL(), document_url_,
|
2021-10-06 02:21:00 +00:00
|
|
|
platform_notification_data, notification_resources);
|
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
|
2023-01-06 02:35:34 +00:00
|
|
|
index 1c1a95953c6c216b378c2ab0bfbef6eeb19cc184..2f0ce853dbb28163aa30914b5bc31be7066d60a2 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
|
2022-11-17 19:59:23 +00:00
|
|
|
@@ -44,6 +44,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
|
2018-10-05 21:24:38 +00:00
|
|
|
BrowserContext* browser_context,
|
|
|
|
|
scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
|
2022-04-12 11:19:14 +00:00
|
|
|
RenderProcessHost* render_process_host,
|
2021-04-29 18:23:28 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2023-01-06 02:35:34 +00:00
|
|
|
const blink::StorageKey& storage_key,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
2022-06-27 20:50:08 +00:00
|
|
|
const WeakDocumentPtr& weak_document_ptr,
|
2022-11-17 19:59:23 +00:00
|
|
|
@@ -112,6 +113,7 @@ class CONTENT_EXPORT BlinkNotificationServiceImpl
|
2018-10-05 21:24:38 +00:00
|
|
|
// The notification context that owns this service instance.
|
2022-01-10 22:31:39 +00:00
|
|
|
raw_ptr<PlatformNotificationContextImpl> notification_context_;
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2022-01-10 22:31:39 +00:00
|
|
|
+ raw_ptr<RenderFrameHost> render_frame_host_;
|
|
|
|
|
raw_ptr<BrowserContext> browser_context_;
|
2018-10-05 21:24:38 +00:00
|
|
|
|
|
|
|
|
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
|
2023-03-10 16:07:42 +00:00
|
|
|
index 00965c253f28bd3947255b2ab77bf3a0bb71f14a..e04a7eef94990dfb0e2fca2e116352fe80965303 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
|
2023-03-10 16:07:42 +00:00
|
|
|
@@ -136,7 +136,7 @@ class BlinkNotificationServiceImplTest : public ::testing::Test {
|
2018-10-11 08:38:48 +00:00
|
|
|
notification_service_ = std::make_unique<BlinkNotificationServiceImpl>(
|
|
|
|
|
notification_context_.get(), &browser_context_,
|
2022-04-12 11:19:14 +00:00
|
|
|
embedded_worker_helper_->context_wrapper(), &render_process_host_,
|
2023-01-06 02:35:34 +00:00
|
|
|
- storage_key_,
|
|
|
|
|
+ nullptr, storage_key_,
|
2021-04-27 21:27:34 +00:00
|
|
|
/*document_url=*/GURL(),
|
2022-11-17 19:59:23 +00:00
|
|
|
contents_.get()->GetPrimaryMainFrame()->GetWeakDocumentPtr(),
|
|
|
|
|
RenderProcessHost::NotificationServiceCreatorType::kDocument,
|
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
|
2023-02-03 11:43:42 +00:00
|
|
|
index aa04c672494e5ecb9ca43eb7e0d3b49bad01e29b..ff24af7f921dc86c00bfd7151dc8d70af6f1b99a 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
|
2023-02-03 11:43:42 +00:00
|
|
|
@@ -283,6 +283,7 @@ void PlatformNotificationContextImpl::Shutdown() {
|
2018-10-05 21:24:38 +00:00
|
|
|
|
|
|
|
|
void PlatformNotificationContextImpl::CreateService(
|
2022-04-12 11:19:14 +00:00
|
|
|
RenderProcessHost* render_process_host,
|
2021-04-29 18:23:28 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2023-01-06 02:35:34 +00:00
|
|
|
const blink::StorageKey& storage_key,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
2022-06-27 20:50:08 +00:00
|
|
|
const WeakDocumentPtr& weak_document_ptr,
|
2023-02-03 11:43:42 +00:00
|
|
|
@@ -291,7 +292,7 @@ void PlatformNotificationContextImpl::CreateService(
|
2018-10-05 21:24:38 +00:00
|
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
|
|
services_.push_back(std::make_unique<BlinkNotificationServiceImpl>(
|
2022-04-12 11:19:14 +00:00
|
|
|
this, browser_context_, service_worker_context_, render_process_host,
|
2023-01-06 02:35:34 +00:00
|
|
|
- storage_key, document_url, weak_document_ptr, creator_type,
|
|
|
|
|
+ render_frame_host, storage_key, document_url, weak_document_ptr, creator_type,
|
2022-11-17 19:59:23 +00:00
|
|
|
std::move(receiver)));
|
2018-10-05 21:24:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h
|
2023-02-03 11:43:42 +00:00
|
|
|
index bbd2aa78722fc0a14ac815ca0243b83965ad8d7c..b6e0a2fce3a0fb9c449aa1bef6a0f970ef5c2d07 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
|
2023-01-06 02:35:34 +00:00
|
|
|
@@ -45,6 +45,7 @@ struct NotificationDatabaseData;
|
2021-04-29 18:23:28 +00:00
|
|
|
class PlatformNotificationServiceProxy;
|
2022-04-12 11:19:14 +00:00
|
|
|
class RenderProcessHost;
|
2021-04-29 18:23:28 +00:00
|
|
|
class ServiceWorkerContextWrapper;
|
|
|
|
|
+class RenderFrameHost;
|
2018-10-05 21:24:38 +00:00
|
|
|
|
2021-04-29 18:23:28 +00:00
|
|
|
// Implementation of the Web Notification storage context. The public methods
|
|
|
|
|
// defined in this interface must only be called on the UI thread.
|
2023-01-06 02:35:34 +00:00
|
|
|
@@ -78,6 +79,7 @@ class CONTENT_EXPORT PlatformNotificationContextImpl
|
2022-11-17 19:59:23 +00:00
|
|
|
// service is created by a dedicated worker, or is `nullptr` otherwise.
|
2019-07-24 22:58:51 +00:00
|
|
|
void CreateService(
|
2022-04-12 11:19:14 +00:00
|
|
|
RenderProcessHost* render_process_host,
|
2021-04-29 18:23:28 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2023-01-06 02:35:34 +00:00
|
|
|
const blink::StorageKey& storage_key,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
2022-06-27 20:50:08 +00:00
|
|
|
const WeakDocumentPtr& weak_document_ptr,
|
2019-12-11 00:22:35 +00:00
|
|
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
2023-03-15 09:20:32 +00:00
|
|
|
index 829a7a2d3966682bd43a6788fa4a7d0514df2d1b..0781fb499a0c490939c2b0a0cfa72efcdb5eb0cc 100644
|
2019-12-11 00:22:35 +00:00
|
|
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
|
|
|
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
2023-03-15 09:20:32 +00:00
|
|
|
@@ -2115,7 +2115,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
2022-11-17 19:59:23 +00:00
|
|
|
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
|
|
|
|
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
|
|
|
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
2023-01-06 02:35:34 +00:00
|
|
|
- this, storage_key, /*document_url=*/GURL(), weak_document_ptr,
|
|
|
|
|
+ this, rfh, storage_key, /*document_url=*/GURL(), weak_document_ptr,
|
2022-11-17 19:59:23 +00:00
|
|
|
creator_type, std::move(receiver));
|
|
|
|
|
break;
|
|
|
|
|
}
|
2023-03-15 09:20:32 +00:00
|
|
|
@@ -2123,7 +2123,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
2022-11-17 19:59:23 +00:00
|
|
|
CHECK(rfh);
|
2019-12-11 00:22:35 +00:00
|
|
|
|
2022-11-17 19:59:23 +00:00
|
|
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
2023-01-06 02:35:34 +00:00
|
|
|
- this, storage_key, rfh->GetLastCommittedURL(), weak_document_ptr,
|
|
|
|
|
+ this, rfh, storage_key, rfh->GetLastCommittedURL(), weak_document_ptr,
|
2022-11-17 19:59:23 +00:00
|
|
|
creator_type, std::move(receiver));
|
|
|
|
|
break;
|
|
|
|
|
}
|
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
|
2023-02-03 11:43:42 +00:00
|
|
|
index d9e36712dc3fbc6a9043e2c33660090ca2f7367b..7d910583eb22fc315eb0619febe518d5c24c0c4d 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
|
2021-04-27 21:27:34 +00:00
|
|
|
@@ -26,6 +26,8 @@ struct PlatformNotificationData;
|
2019-04-20 17:20:37 +00:00
|
|
|
|
2018-10-05 21:24:38 +00:00
|
|
|
namespace content {
|
|
|
|
|
|
2021-04-29 18:23:28 +00:00
|
|
|
+class RenderFrameHost;
|
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 {
|
2021-04-27 21:27:34 +00:00
|
|
|
// This method must be called on the UI thread. |document_url| is empty when
|
|
|
|
|
// the display notification originates from a worker.
|
2018-10-05 21:24:38 +00:00
|
|
|
virtual void DisplayNotification(
|
2021-04-29 18:23:28 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2018-10-05 21:24:38 +00:00
|
|
|
const std::string& notification_id,
|
|
|
|
|
const GURL& origin,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
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
|
2023-02-03 11:43:42 +00:00
|
|
|
index b3ef5af4450b3f96787bc3f9935dfdf19ebaaa94..6a4309070e0f6eaa743deefb0aeb2d0be558a787 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
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* chore: remove content_browser_main_loop.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
The function being patched (BrowserMainLoop::MainMessageLoopRun()) no
longer exists.
NB: if removing this introduces regressions the likely fix will be to
add a similar patch for ShellBrowserMainParts::WillRunMainMessageLoop()
which has similar code and was added at the same time this was removed.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* chore: remove v8/skip_global_registration_of_shared_arraybuffer_backing_stores.patch
Refs: https://chromium-review.googlesource.com/c/v8/v8/+/2763874
This patch has been merged upstream
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785841
SkColorFromColorId() no longer takes theme, scheme args
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2772143
Change new calls to GetDarkSchemeColor to fit our patched call signature
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_ in our mojom
* chore: update chromium/frame_host_manager.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update chromium/revert_remove_contentrendererclient_shouldfork.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2755314
Upstream has removed `history_list_length_` which we were comparing to 0
to calculate our `is_initial_navigation` bool when calling ShouldFork().
ShouldFork() is ours and none of the code paths actually use that param,
so this commit removes it altogether.
* chore: update permissions_to_register
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2789074
Replace all uses of APIPermission::ID enum with Mojo type
* refactor: update return type of PreMainMessageLoopRun()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
Used to return void; now returns an int errorcode.
Note: 2725153 also has some nice doc updates about Browser's "stages"
* refactor: sync ElectronBrowserMainParts to MainParts changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
RunMainMessageLoopParts has been replaced with WillRunMainMessageLoop
so `BrowserMainLoop::result_code_` is no longer available to us for our
exit_code_ pointer.
This variable held a dual role: (1) of course, hold the exit code, but
also (2) was a nullptr before the message loop was ready, indicating to
anyone calling SetExitCode() that we were still in startup and could
just exit() without any extra steps. exit_code_ still fulfills these two
roles but is now a base::Optional.
* chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
BrowserMainParts::BrowsePreDefaultMainMesssageLoopRun() has been
removed; move that work to the new WillRunMainMessageLoop().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* refactor: update use of threadpools.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2773408
The upstream code is still in flux (e.g. reverts and re-lands) but the
tl;dr for this commit is (1) include thread_pool.h if you're using it
and (2) don't instantiate pools directly.
* refactor: remove routing_id from CreateLoaderAndStart
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
NB: One logic branch in ProxyingURLLoaderFactory::CreateLoaderAndStart
calls std::make_unique<InProgressRequest>, which needs a routing_id.
This PR uses the member field `routing_id_` since there's no longer one
being passed into CreateLoaderAndStart.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* refactor: sync with upstream UrlInfo ctor changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update invocation of convert_protocol_to_json.py
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2792623
python3 is being used in parts of the upstream build, but the copy of
convert_protocol_to_json.py invoked in v8/third_party/inspector_protocol
is not python3-friendly. Node has a py2+3-friendly version of it in its
tools directory, so call it instead.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* chore: Remove support for TLS1.0/1.1 in SSLVersionMin policy
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2765737
Remove TLS v1.0 & 1.1 from our SSLProtocolVersionFromString() function.
This is the same change made upstream at
https://chromium-review.googlesource.com/c/chromium/src/+/2765737/8/chrome/browser/ssl/ssl_config_service_manager_pref.cc
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* chore: Use IDType for permission change subscriptions.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791431
tldr: {Subscribe,Unsubscribe}PermissionStatusChange's tag type used to
be an int; now it's the new SubscriptionId type (which is an IdType64).
* chore: sync PowerMonitor code to upstream refactor
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2752635
tldr: PowerMonitor has been split into PowerStateObserver,
PowerSuspendObserver, and PowerThermalObserver to reduce number of tasks
posted to consumers who only need notifications for one of those things
instead of all of them.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* chore: update chromium/gtk_visibility.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796200
tldr: no code changes; just updating the diff to apply cleanly.
note: ooh upstream Wayland hacking!
* chore: update chromium/picture-in-picture.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710023
tldr: no code changes; just updating the diff to apply cleanly.
* chore: update chromium/worker_feat_add_hook_to_notify_script_ready.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2775573
tldr: no code changes; just updating the diff to apply cleanly.
* chore: export_all_patches
* chore: update chromium/feat_add_set_theme_source_to_allow_apps_to.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796511
tldr: NotifyObservers has been renamed to NotifyOnNativeThemeUpdated,
so update the invocation in our patch.
* chore: update ElectronBrowserClient w/upstream API
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797454
tldr: GetDevToolsManagerDelegate() was returning an owned raw pointer.
Replaced it with CreateDevToolsManagerDelegate() which uses unique_ptr<>.
* chore: handle new content::PermissionType::FILE_HANDLING in toV8()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762201
`file-handling` string confirmed in https://chromium-review.googlesource.com/c/chromium/src/+/2762201/18/chrome/browser/ui/webui/settings/site_settings_helper.cc
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 2733595: [ch-r] Parse ACCEPT_CH H2/3 frame and restart with new headers if needed
https://chromium-review.googlesource.com/c/chromium/src/+/2733595
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* build: fix missing symbols on linux build
* use_ozone and use_x11 are not exclusive
* new button view to build for pip
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* fix: invalid usage of non-targetted PostTask
You must always either use a host threadpool or specify a target
thread. In this case we did neither after this refactor.
Refs: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
2021-04-15 17:44:35 +00:00
|
|
|
@@ -29,6 +29,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(
|
2018-10-11 08:38:48 +00:00
|
|
|
MockPlatformNotificationService::~MockPlatformNotificationService() = default;
|
|
|
|
|
|
|
|
|
|
void MockPlatformNotificationService::DisplayNotification(
|
2022-01-11 19:27:24 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2018-10-11 08:38:48 +00:00
|
|
|
const std::string& notification_id,
|
|
|
|
|
const GURL& origin,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|
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
|
2023-02-03 11:43:42 +00:00
|
|
|
index 7cd457defa729855c8d7c9d873efab5389d025cd..2b8e644d54d93a9499adcc1bf5660d72a24e2f29 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
|
2022-01-10 22:31:39 +00:00
|
|
|
@@ -52,6 +52,7 @@ class MockPlatformNotificationService : public PlatformNotificationService {
|
2018-10-11 08:38:48 +00:00
|
|
|
|
|
|
|
|
// PlatformNotificationService implementation.
|
|
|
|
|
void DisplayNotification(
|
2022-01-11 19:27:24 +00:00
|
|
|
+ RenderFrameHost* render_frame_host,
|
2018-10-11 08:38:48 +00:00
|
|
|
const std::string& notification_id,
|
|
|
|
|
const GURL& origin,
|
2021-04-27 21:27:34 +00:00
|
|
|
const GURL& document_url,
|