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

chore: update patches

Browse source
This commit is contained in:
John Kleinschmidt 2021-03-15 14:32:18 -04:00
parent f933c249fe
commit 1e16606524
64 changed files with 423 additions and 465 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/chromium/expose_setuseragent_on_networkcontext.patch
View file

@ -33,10 +33,10 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index d39671bacc738e9185632bdebac31191d1a0c159..2465a053da8f95c3f643a908bbfe06143fa7d78d 100644
index 8a00bf59c728217069000b1f1ece72e1540baf85..fc98675c01f64e6c674a7cdb4d9195edff446949 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1158,6 +1158,13 @@ void NetworkContext::SetNetworkConditions(
@@ -1139,6 +1139,13 @@ void NetworkContext::SetNetworkConditions(
std::move(network_conditions));
}
@ -51,7 +51,7 @@ index d39671bacc738e9185632bdebac31191d1a0c159..2465a053da8f95c3f643a908bbfe0614
// 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 23bbc41ddfee63dacd622a1aa3cf750682501c76..68888f46623667f00ac6b6f1f7fb7d33965333a0 100644
index 06b1a0d550de946aa41efca2be4efde694cc24c7..fe7c5c6501838e480c2bc95823e9f562839ad99c 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -254,6 +254,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@ -63,10 +63,10 @@ index 23bbc41ddfee63dacd622a1aa3cf750682501c76..68888f46623667f00ac6b6f1f7fb7d33
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index b1e73dc3250bb8402d4becfd673fd9aa54ecd7fb..cfa9d0c197ca9851f13b088ecae4aba614c7ac55 100644
index 7a62dfd110555d2bf6ed4be075967ce6396855ef..b35746e2850d7d724fcf3dc09ddbfea1ca56a746 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -964,6 +964,9 @@ interface NetworkContext {
@@ -948,6 +948,9 @@ interface NetworkContext {
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
NetworkConditions? conditions);
@ -77,7 +77,7 @@ index b1e73dc3250bb8402d4becfd673fd9aa54ecd7fb..cfa9d0c197ca9851f13b088ecae4aba6
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index feecbe157692fe205d176e3782b24c17b85f4e18..2bd5713a46616231a5af19a5357bfbd851105582 100644
index f233265ccc0be9b412bf2e3e702e12614fa435c4..51006ddb52a0c4c4ea9f1cdb631cf4d75967bb66 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -117,6 +117,7 @@ class TestNetworkContext : public mojom::NetworkContext {