* chore: bump chromium in DEPS to 142.0.7401.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6911185: Reland "Send touch moves async immediately after scroll starts." https://chromium-review.googlesource.com/c/chromium/src/+/6911185 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6906887: mac: click through content area in main window https://chromium-review.googlesource.com/c/chromium/src/+/6906887 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6916667: Expose helper to eliminate duplicate recipes. https://chromium-review.googlesource.com/c/chromium/src/+/6916667 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h. https://chromium-review.googlesource.com/c/chromium/src/+/6909842 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6884056: Remove the SecKeychain implementation for the Keychain interface https://chromium-review.googlesource.com/c/chromium/src/+/6884056 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6904906: Remove `WTF::` in renderer/core/[p-x].*/ https://chromium-review.googlesource.com/c/chromium/src/+/6904906 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6556585: [persistent_cache]: PersistentCache for CodeCache https://chromium-review.googlesource.com/c/chromium/src/+/6556585 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6904864: Layout: Support abort on the text placeholder layout https://chromium-review.googlesource.com/c/chromium/src/+/6904864 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7402.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6905244: [api] Remove deprecated `GetIsolate` https://chromium-review.googlesource.com/c/v8/v8/+/6905244 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6897694: Remove NativeTheme::UserHasContrastPreference(). https://chromium-review.googlesource.com/c/chromium/src/+/6897694 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6897477: Remove GetPlatformHighContrastColorScheme() and enum. https://chromium-review.googlesource.com/c/chromium/src/+/6897477 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()" https://chromium-review.googlesource.com/c/chromium/src/+/6918198 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6907147: [LNA] add use counter for websocket mixed-content issues https://chromium-review.googlesource.com/c/chromium/src/+/6907147 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6914538: Replace WTF::String with blink::String https://chromium-review.googlesource.com/c/website/+/6914538 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6892538: [video pip] Allow touchscreen users to toggle live caption https://chromium-review.googlesource.com/c/chromium/src/+/6892538 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fix patch Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7403.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * build: remove ninja logs Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6920670: [PDF] Change pdf_extension_util to return dictionaries https://chromium-review.googlesource.com/c/chromium/src/+/6920670 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6917864: Devirtualize and inline various NativeTheme getters. https://chromium-review.googlesource.com/c/chromium/src/+/6917864 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL() https://chromium-review.googlesource.com/c/chromium/src/+/6920873 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * build: don't kill blink/web_tests Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions) https://chromium-review.googlesource.com/c/chromium/src/+/6923655 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6905242: Reland "[CSP] Clarify report-only console messages." https://chromium-review.googlesource.com/c/chromium/src/+/6905242 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fixup! 6897694: Remove NativeTheme::UserHasContrastPreference(). Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7405.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6910012: [LNA] Enable LNA enforcement by default https://chromium-review.googlesource.com/c/chromium/src/+/6910012 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6929444: Combine GetInstanceForXXX() implementations. https://chromium-review.googlesource.com/c/chromium/src/+/6929444 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6927873: Rename native_widget_types.h -> native_ui_types.h https://chromium-review.googlesource.com/c/chromium/src/+/6927873 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6853978: Init perfetto really early in WebView https://chromium-review.googlesource.com/c/chromium/src/+/6853978 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6874886: Use only one picker observer to avoid getting duplicate notifications https://chromium-review.googlesource.com/c/chromium/src/+/6874886 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * fix: Protocol complex inline dtor Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7407.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7409.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7411.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 142.0.7413.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6927233: Remove NativeTheme "use dark colors" bit. https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes https://chromium-review.googlesource.com/c/chromium/src/+/6899206 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: bump chromium in DEPS to 142.0.7415.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6936895: [headless] Remove headless flag from views::Widget class https://chromium-review.googlesource.com/c/chromium/src/+/6936895 We should probably followup on this to see if there is a way to do this without reverting this CL. Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 6937023: Reland "Use new DBus type system in dbus_xdg::Request" https://chromium-review.googlesource.com/c/chromium/src/+/6937023 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update patches Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 6944749: Add GN visibility list to //components/os_crypt/sync https://chromium-review.googlesource.com/c/chromium/src/+/6944749 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Further replace sub_capture_target_version with CaptureVersion https://chromium-review.googlesource.com/c/chromium/src/+/6935455 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup for lint Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: update filenames.libcxx.gni Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 142.0.7417.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6944136: Reorder NativeTheme headers/.cc files. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6944404: Remove extraneous callback call Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * chore: update patches Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6917864: Devirtualize and inline various NativeTheme getters. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6937588: Add initial OsSettingsProvider object, supplying caret blink interval. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * 6910482: [Save to Drive] Implement retry functionality Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 Co-authored-by: David Sanders <dsanders11@ucsbalum.com> * Revert "build: remove ninja logs" This reverts commit 72874740fdfca4101404ce7855e976791cfc79ef. Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> * test: fix flakey test picked from PR 48205 Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
90 lines
4.4 KiB
Diff
90 lines
4.4 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 95822f635b61da7c63b5a1babf93bb61cb786293..892fa1d8d340906d359685894da6553377cda73b 100644
|
|
--- a/services/network/network_context.cc
|
|
+++ b/services/network/network_context.cc
|
|
@@ -1907,6 +1907,13 @@ void NetworkContext::EnableDurableMessageCollector(
|
|
it->second->AddReceiver(std::move(receiver));
|
|
}
|
|
|
|
+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 56f1eec94a33c2c9a6289b12ac20323b4bef13d9..1b99211c9c96efba0713e953e708712d6c3714a6 100644
|
|
--- a/services/network/network_context.h
|
|
+++ b/services/network/network_context.h
|
|
@@ -335,6 +335,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
|
const base::UnguessableToken& throttling_profile_id,
|
|
mojo::PendingReceiver<network::mojom::DurableMessageCollector> receiver)
|
|
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_CT_SUPPORTED)
|
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
|
index 840eff6ece73983a3b98673adbbb3cfd825565fe..5159d804c493bf2ae08d2786187c614efc96cf23 100644
|
|
--- a/services/network/public/mojom/network_context.mojom
|
|
+++ b/services/network/public/mojom/network_context.mojom
|
|
@@ -1337,6 +1337,9 @@ interface NetworkContext {
|
|
mojo_base.mojom.UnguessableToken throttling_profile_id,
|
|
pending_receiver<DurableMessageCollector> receiver);
|
|
|
|
+ // 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 6f0fe6423e8be903d4e38b783d31443c6ce89db5..9a5d7ad5d6e84e8b824c1614ee006c4984817929 100644
|
|
--- a/services/network/test/test_network_context.h
|
|
+++ b/services/network/test/test_network_context.h
|
|
@@ -161,6 +161,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_CT_SUPPORTED)
|