Uplift of #6996 (squashed) to release

brave · Oct 30, 2020 · 28ba3d5 · 28ba3d5
1 parent 1dfc77c
commit 28ba3d5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git 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
   }
 }