chore: bump chromium to 4563763ef26ad940d4e988d7245dd (master) (#23219)

* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031

* update patches

* update patches

* Remove both vs browser/child split in content gn files.

2157965

* chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd

* update patches

* update patches

* Add ElectronKioskDelegate for extensions

2159760

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot 2020-04-23 18:55:17 -07:00 committed by GitHub
parent 176a120ec2
commit 37db307153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 226 additions and 174 deletions

View file

@ -33,7 +33,7 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index fa804e8f46ce96af4d9c1c2172220b0780729103..4e84b19cd515883f9dd1db4672ab1a3fccbf00f3 100644
index b7c83cceb2297eddcb345e75a95b7744b08d2e6b..7dda5ce275aef7670406e3cb3b08bd6d14d188ef 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1044,6 +1044,13 @@ void NetworkContext::SetNetworkConditions(
@ -51,10 +51,10 @@ index fa804e8f46ce96af4d9c1c2172220b0780729103..4e84b19cd515883f9dd1db4672ab1a3f
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index b70111eda2ed582e2b81e0364c6e5fade743515b..2682dc391d23cb9fe568c182ed55cc43412d9a1c 100644
index cff8a36b7703df31d0823efb2549f57d7c6c6907..ae9c7a0d6cd98f59892fd5b0fcb6a0307cd842fc 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -238,6 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@@ -242,6 +242,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
mojom::NetworkConditionsPtr conditions) override;
@ -63,10 +63,10 @@ index b70111eda2ed582e2b81e0364c6e5fade743515b..2682dc391d23cb9fe568c182ed55cc43
void SetEnableReferrers(bool enable_referrers) override;
#if defined(OS_CHROMEOS)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 485960c69443533461da4f95d2e73995f604702f..45e920425345dd3cdb2427df5f60f6d8cc81e07a 100644
index e834a5f9a4b6c698ad20e3b9cdc99e871e4035df..18c3c5312be05333e6ed19ad53bb6296be5db4b7 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -1021,6 +1021,9 @@ interface NetworkContext {
@@ -1026,6 +1026,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
NetworkConditions? conditions);
@ -77,7 +77,7 @@ index 485960c69443533461da4f95d2e73995f604702f..45e920425345dd3cdb2427df5f60f6d8
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index 30463e8b23411ff7d2b0c8b2464959b2f3ae88c2..f86b16b57b5b032c4460357e8c2248e4cd632712 100644
index b2be49a841af089adb1c85eb87aa6c198a522001..eee74c88beffafcfba75bb76ad7c54154a57aa39 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -104,6 +104,7 @@ class TestNetworkContext : public mojom::NetworkContext {