* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip" https://chromium-review.googlesource.com/c/chromium/src/+/4910494 * 4812338: Move partition_alloc into a "partition_alloc" dir. https://chromium-review.googlesource.com/c/chromium/src/+/4812338 * [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog https://chromium-review.googlesource.com/c/chromium/src/+/4909897 * 4894923: Force enable raw_ptrs pointer arithmetic check. https://chromium-review.googlesource.com/c/chromium/src/+/4894923 * gin: Prevent wrappables from being constructed from author code. https://chromium-review.googlesource.com/c/chromium/src/+/4905829 * chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo" https://chromium-review.googlesource.com/c/chromium/src/+/4918545 * 4881761: UI bindings for visual logging with structured metrics. https://chromium-review.googlesource.com/c/chromium/src/+/4881761 * chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components https://chromium-review.googlesource.com/c/chromium/src/+/4911894 * chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4931270 * chore: add TransferDragSecurityInfo() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4928028 * mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4919478 Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944243 * chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4939602 * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4908053 no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4936315 minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4937937 adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4865412 minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4942936 minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4455776 This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4912601 needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
		
			
				
	
	
		
			90 lines
		
	
	
	
		
			4.5 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			90 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 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d41b0dbd3b 100644
 | 
						|
--- a/net/url_request/static_http_user_agent_settings.h
 | 
						|
+++ b/net/url_request/static_http_user_agent_settings.h
 | 
						|
@@ -30,13 +30,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_;
 | 
						|
 };
 | 
						|
 
 | 
						|
 }  // namespace net
 | 
						|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 | 
						|
index 416ce43ee7e3632fe2bb796a2f090608c600086f..dc0a9a0b4b2d3fa2ea0c9d0c916f81b66c9468e4 100644
 | 
						|
--- a/services/network/network_context.cc
 | 
						|
+++ b/services/network/network_context.cc
 | 
						|
@@ -1562,6 +1562,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 49d3215854977cbe78dff2909739646f0c40dad9..93ed007eb4ed65625d1c7edac240f138ea89a551 100644
 | 
						|
--- a/services/network/network_context.h
 | 
						|
+++ b/services/network/network_context.h
 | 
						|
@@ -317,6 +317,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 BUILDFLAG(IS_CHROMEOS)
 | 
						|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 | 
						|
index c224584c548b9373b681deae026baec48c458213..4b7881410d85b789442fa09aebddd5a12af8710b 100644
 | 
						|
--- a/services/network/public/mojom/network_context.mojom
 | 
						|
+++ b/services/network/public/mojom/network_context.mojom
 | 
						|
@@ -1244,6 +1244,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 b7b485b79ccbd1dd32f2777c4b54856c5dc5ea97..568524abba08fc0a4b0ce817593b7412dbb21ab8 100644
 | 
						|
--- a/services/network/test/test_network_context.h
 | 
						|
+++ b/services/network/test/test_network_context.h
 | 
						|
@@ -145,6 +145,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 BUILDFLAG(IS_CHROMEOS)
 |