mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 78.0.3899.1 * chore: bump chromium in DEPS to 78.0.3900.1 * chore: bump chromium in DEPS to 78.0.3900.2 * chore: bump chromium in DEPS to 78.0.3901.1 * chore: bump chromium in DEPS to 78.0.3902.1 * chore: remove tts.patch https://chromium-review.googlesource.com/c/chromium/src/+/1717595 * build: disable widevine cdm component https://chromium-review.googlesource.com/c/chromium/src/+/1767596 * chore: bump chromium in DEPS to 78.0.3903.1 * build: redo network_context.h mojification187df411f2%5E%21/#F7 * build: disable widevine Disable widevine, atleast for the moment by deleting the patch and removing the build argument. > At the moment its horribly broken, we would have to look into fixing on all > three platforms now that upstream also supports linux. * chore: bump chromium in DEPS to 78.0.3904.1 * update pepper_flash.patch https://chromium-review.googlesource.com/c/chromium/src/+/1771371 * chore: bump chromium in DEPS to 78.0.3905.1 * Update patches * Convert Web Speech Synthesis API over to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/1717595 (cherry picked from commite0163b0185) * Update patches * CookieInclusionStatus: Support warnings and multiple exclusion reasons https://chromium-review.googlesource.com/c/chromium/src/+/1756157 (cherry picked from commitab2f5ac40b) * Pass request_unadjusted_movement to lock mouse https://chromium-review.googlesource.com/c/chromium/src/+/1767098 (cherry picked from commita17daff6f1) * chore: rename thread_pool to thread_pool_instance Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1773663 (cherry picked from commit8547b09de8) * Remove the typemap from network::mojom::URLResponseHead. https://chromium-review.googlesource.com/c/chromium/src/+/1758653 (cherry picked from commita768ad210d) * ServiceWorker: Make Extension WebRequestAPI aware of service worker update check script requests https://chromium-review.googlesource.com/c/chromium/src/+/1782230 (cherry picked from commit615d33517a) * Convert CertVerifierClient to new Mojo types https://bugs.chromium.org/p/chromium/issues/detail?id=955171 (cherry picked from commitac5e8dbce5) * Convert DataPipeGetterPtr and DataPipeGetterRequest to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1787760 https://chromium-review.googlesource.com/c/chromium/src/+/1787659 (cherry picked from commit8611783898) * Add tts patch * build: fix compilation with MSSTL (cherry picked from commit4d8cb7de9b)
91 lines
4.5 KiB
Diff
91 lines
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Wed, 28 Aug 2019 12:21:25 -0700
|
|
Subject: expose SetUserAgent on NetworkContext
|
|
|
|
Applying
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/1585083 before
|
|
it's merged. There may end up being a better way of doing this, or the
|
|
patch may be merged upstream, at which point this patch should be
|
|
removed.
|
|
|
|
diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
|
|
index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a289703d8b0577 100644
|
|
--- a/net/url_request/static_http_user_agent_settings.h
|
|
+++ b/net/url_request/static_http_user_agent_settings.h
|
|
@@ -26,13 +26,17 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings {
|
|
accept_language_ = new_accept_language;
|
|
}
|
|
|
|
+ void set_user_agent(const std::string& new_user_agent) {
|
|
+ user_agent_ = new_user_agent;
|
|
+ }
|
|
+
|
|
// HttpUserAgentSettings implementation
|
|
std::string GetAcceptLanguage() const override;
|
|
std::string GetUserAgent() const override;
|
|
|
|
private:
|
|
std::string accept_language_;
|
|
- const std::string user_agent_;
|
|
+ std::string user_agent_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
|
|
};
|
|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
|
index 96f99d73d7043a6fe98569aa7b8deddeb2ac9b6c..79a37775ecba02c137bb9842e285185d6fc8dbc0 100644
|
|
--- a/services/network/network_context.cc
|
|
+++ b/services/network/network_context.cc
|
|
@@ -1103,6 +1103,13 @@ void NetworkContext::SetNetworkConditions(
|
|
std::move(network_conditions));
|
|
}
|
|
|
|
+void NetworkContext::SetUserAgent(const std::string& new_user_agent) {
|
|
+ // This may only be called on NetworkContexts created with a constructor that
|
|
+ // calls ApplyContextParamsToBuilder.
|
|
+ DCHECK(user_agent_settings_);
|
|
+ user_agent_settings_->set_user_agent(new_user_agent);
|
|
+}
|
|
+
|
|
void NetworkContext::SetAcceptLanguage(const std::string& new_accept_language) {
|
|
// 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 8e140617acc891ad51bf98c80d49a1255cb08af6..a662dfc7104df48cdb71d91a9227ddeb8cf81590 100644
|
|
--- a/services/network/network_context.h
|
|
+++ b/services/network/network_context.h
|
|
@@ -218,6 +218,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
|
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override;
|
|
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
|
|
mojom::NetworkConditionsPtr conditions) override;
|
|
+ void SetUserAgent(const std::string& new_user_agent) override;
|
|
void SetAcceptLanguage(const std::string& new_accept_language) override;
|
|
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 99ad77ca1b97b9e618bb2ad4b108bb892ed5e9d7..289fb533afe44475ee4236bd6e61301eb978a358 100644
|
|
--- a/services/network/public/mojom/network_context.mojom
|
|
+++ b/services/network/public/mojom/network_context.mojom
|
|
@@ -886,6 +886,9 @@ interface NetworkContext {
|
|
SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
|
|
NetworkConditions? conditions);
|
|
|
|
+ // Updates the user agent to be used for requests.
|
|
+ SetUserAgent(string new_user_agent);
|
|
+
|
|
// Updates the Accept-Language header to be used for requests.
|
|
SetAcceptLanguage(string new_accept_language);
|
|
|
|
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
|
|
index 34a8050d5900534663c285028eb42720a5bc8621..e5e361cd197d5080761d07a18f8af6727b395015 100644
|
|
--- a/services/network/test/test_network_context.h
|
|
+++ b/services/network/test/test_network_context.h
|
|
@@ -95,6 +95,7 @@ class TestNetworkContext : public mojom::NetworkContext {
|
|
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
|
|
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
|
|
mojom::NetworkConditionsPtr conditions) override {}
|
|
+ void SetUserAgent(const std::string& new_user_agent) override {}
|
|
void SetAcceptLanguage(const std::string& new_accept_language) override {}
|
|
void SetEnableReferrers(bool enable_referrers) override {}
|
|
#if defined(OS_CHROMEOS)
|