From 28ba3d58f786bd10b9dbe7dd60214b48f3deada4 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Fri, 30 Oct 2020 15:10:57 +0000 Subject: [PATCH] Uplift of #6996 (squashed) to release --- browser/farbling/farbling_tab_helper.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/browser/farbling/farbling_tab_helper.cc b/browser/farbling/farbling_tab_helper.cc index 7fc1ebff53f4..a89d1b0fbecd 100644 --- a/browser/farbling/farbling_tab_helper.cc +++ b/browser/farbling/farbling_tab_helper.cc @@ -114,7 +114,11 @@ FarblingTabHelper::FarblingTabHelper(content::WebContents* web_contents) void FarblingTabHelper::DidStartNavigation( content::NavigationHandle* navigation_handle) { +// TODO(samartnik): it breaks desktop mode on Android. +// We need to figure out whether we need this functionality on Android. +#if !defined(OS_ANDROID) UpdateUserAgent(navigation_handle); +#endif } void FarblingTabHelper::UpdateUserAgent( @@ -148,18 +152,12 @@ void FarblingTabHelper::UpdateUserAgent( .c_str()); ua = content::BuildUserAgentFromOSAndProduct(minimal_os_info, GetMinimalProduct()); -// It breaks desktop mode on Android -#if !defined(OS_ANDROID) navigation_handle->SetIsOverridingUserAgent(true); -#endif web_contents->SetUserAgentOverride( blink::UserAgentOverride::UserAgentOnly(ua), false /* override_in_new_tabs */); } else { -// It breaks desktop mode on Android -#if !defined(OS_ANDROID) navigation_handle->SetIsOverridingUserAgent(false); -#endif } }