chore: bump chromium to 137.0.7141.0 (main) (#46725)
* chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs https://chromium-review.googlesource.com/c/chromium/src/+/6474596 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6471184 * [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs https://chromium-review.googlesource.com/c/chromium/src/+/6459481 * Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs https://chromium-review.googlesource.com/c/chromium/src/+/6455975 * clickiness: Check attestation and user settings on origins Refs https://chromium-review.googlesource.com/c/chromium/src/+/6356796 * extensions : Move ReloadExtension from ExtensionService Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472812 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6472777 * fixup! Update AppleKeychain API to be friendlier Refs https://chromium-review.googlesource.com/c/chromium/src/+/6443472 * chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs https://chromium-review.googlesource.com/c/chromium/src/+/6373793 * [headless] Provide headless aware window metrics on Windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/6374074 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
e9f279afd1
commit
08b7a1f801
68 changed files with 393 additions and 371 deletions
|
@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
|
|||
|
||||
} // namespace net
|
||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||
index b55c17b34e5cc5e367e28c834125c4c74f6cef77..9ef082618e0863eb5ccf69e3740f5dcb98c3ccd0 100644
|
||||
index 523a18fac8433b7d2b9f17f3185c5bd31e33f5cc..f9dab730cc27234d2143c3172dc404d4e80dcf5e 100644
|
||||
--- a/services/network/network_context.cc
|
||||
+++ b/services/network/network_context.cc
|
||||
@@ -1817,6 +1817,13 @@ void NetworkContext::SetNetworkConditions(
|
||||
@@ -1829,6 +1829,13 @@ void NetworkContext::SetNetworkConditions(
|
||||
std::move(network_conditions));
|
||||
}
|
||||
|
||||
|
@ -51,7 +51,7 @@ index b55c17b34e5cc5e367e28c834125c4c74f6cef77..9ef082618e0863eb5ccf69e3740f5dcb
|
|||
// 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 2596fecc569d59394703579cda02a27c629d843c..53145360b750ae0167da215fad89e0eae5418deb 100644
|
||||
index ca064589d9f2f6e00697f3b896ad522a5cf9bb6c..7ebbef514a99497fcb024a4a57adca6facf039fe 100644
|
||||
--- a/services/network/network_context.h
|
||||
+++ b/services/network/network_context.h
|
||||
@@ -325,6 +325,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
||||
|
@ -63,10 +63,10 @@ index 2596fecc569d59394703579cda02a27c629d843c..53145360b750ae0167da215fad89e0ea
|
|||
void SetEnableReferrers(bool enable_referrers) override;
|
||||
#if BUILDFLAG(IS_CT_SUPPORTED)
|
||||
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
||||
index 0278c216fd810a1a96c53b57f80e6e91b473f5b0..5899dff0db16bbdf56e9689b206974e0020f1f8b 100644
|
||||
index f510b5c5c79161f32a08219aa7f6cd7a722eed85..6bc2f6221fe61e861ece518381c697e4cf4727a1 100644
|
||||
--- a/services/network/public/mojom/network_context.mojom
|
||||
+++ b/services/network/public/mojom/network_context.mojom
|
||||
@@ -1276,6 +1276,9 @@ interface NetworkContext {
|
||||
@@ -1278,6 +1278,9 @@ interface NetworkContext {
|
||||
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
|
||||
NetworkConditions? conditions);
|
||||
|
||||
|
@ -77,7 +77,7 @@ index 0278c216fd810a1a96c53b57f80e6e91b473f5b0..5899dff0db16bbdf56e9689b206974e0
|
|||
SetAcceptLanguage(string new_accept_language);
|
||||
|
||||
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
|
||||
index 64ed19803dc00575422a1b024cfb8907be17302e..8639b76fad84ced1434bee4d41cbbb579cbdd483 100644
|
||||
index 81930f3b5ca760d4db9c65aeb36162ddea68a872..5d67e45515480b769ed6555f6e0c18f25fde1e6c 100644
|
||||
--- a/services/network/test/test_network_context.h
|
||||
+++ b/services/network/test/test_network_context.h
|
||||
@@ -159,6 +159,7 @@ class TestNetworkContext : public mojom::NetworkContext {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue