diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-01 16:09:00 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-04-13 10:10:34 +0000 |
| commit | 794de90e20aed6c2684c8d25b3750926aa3c8051 (patch) | |
| tree | dc0edc347e23932b624c2f5df49af460a9b53931 | |
| parent | f78b11a11478eb0744f3eefcf807e9985923cbb3 (diff) | |
| download | qtwebengine-chromium-794de90e20aed6c2684c8d25b3750926aa3c8051.tar.gz | |
Fixup user-agent override for new tabs again
Just short-cut it.
Change-Id: Ib1ffb39496ac8d022e5426d7ce211c6e44ecf2b5
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| -rw-r--r-- | chromium/content/browser/renderer_host/navigation_controller_impl.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/navigation_request.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/chromium/content/browser/renderer_host/navigation_controller_impl.cc b/chromium/content/browser/renderer_host/navigation_controller_impl.cc index bf39f5fc309..5d1db8b4be8 100644 --- a/chromium/content/browser/renderer_host/navigation_controller_impl.cc +++ b/chromium/content/browser/renderer_host/navigation_controller_impl.cc @@ -2390,7 +2390,7 @@ void NavigationControllerImpl::NavigateFromFrameProxy( /* params.redirect_chain: skip */ params.extra_headers = extra_headers; params.is_renderer_initiated = is_renderer_initiated; - params.override_user_agent = UA_OVERRIDE_INHERIT; + params.override_user_agent = override_user_agent ? UA_OVERRIDE_TRUE : UA_OVERRIDE_INHERIT; /* params.base_url_for_data_url: skip */ /* params.virtual_url_for_data_url: skip */ /* params.data_url_as_string: skip */ diff --git a/chromium/content/browser/renderer_host/navigation_request.h b/chromium/content/browser/renderer_host/navigation_request.h index 8463d7bd60e..4b7b5fba93d 100644 --- a/chromium/content/browser/renderer_host/navigation_request.h +++ b/chromium/content/browser/renderer_host/navigation_request.h @@ -1081,7 +1081,15 @@ class CONTENT_EXPORT NavigationRequest base::Optional<network::mojom::BlockedByResponseReason> EnforceCOEP(); bool IsOverridingUserAgent() const { +#ifdef TOOLKIT_QT + if (!commit_params_->is_overriding_user_agent && !entry_overrides_ua_) + LOG(WARNING) << "UserAgent override lost"; + return true; // QtWebEngine always uses profile specific user-agent, and + // Chromium is _really_ broken when it comes to tracking _if_ overrides + // should be used, but not the overrides themselves +#else return commit_params_->is_overriding_user_agent || entry_overrides_ua_; +#endif } // Returns the user-agent override, or an empty string if one isn't set. |