merge from master

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 86.0.4240.181
+* allow sticky desktop mode for all tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/780)
+
 # 86.0.4240.112
 * fix crash in new overflow menu (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/771)
 

build/RELEASE

@@ -1 +1 @@
-86.0.4240.112
+86.0.4240.181

build/bromite_patches_list.txt

@@ -149,5 +149,5 @@ Hardening-against-incognito-mode-detection.patch
 Remove-weblayer-dependency-on-Play-Services.patch
 Timezone-customization.patch
 Move-some-account-settings-back-to-privacy-settings.patch
-Automated-domain-substitution.patch
 Add-a-flag-to-always-view-desktop-site-for-all-websites.patch
+Automated-domain-substitution.patch

build/patches/Add-a-flag-to-always-view-desktop-site-for-all-websites.patch

@@ -401,10 +401,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +        Customize User Agent
 +      </message>
 +      <message name="IDS_OPTION_DESKTOP_FLAG_ON" desc="The label of the option that allows users to sticky desktop mode view flag under hambuger menu.">
-+        Sticky flag for desktop mode view hambuger flag (for all tabs)
++        Desktop mode toggle in hamburger menu applies to all tabs
 +      </message>
 +      <message name="IDS_OPTION_DESKTOP_FLAG_OFF" desc="The label of the option that revert the hambuger menu flag to actual behaviour.">
-+        Use hambuger flag for desktop view mode only for current tab
++        Desktop mode toggle in hamburger menu applies to current tab only
 +      </message>
 +
        <!-- Notification channels -->
@@ -469,3 +469,6 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/frameh
          void clearHistory(long nativeNavigationControllerAndroid, NavigationControllerImpl caller);
          int getNavigationHistory(long nativeNavigationControllerAndroid,
                  NavigationControllerImpl caller, Object history);
+-- 
+2.17.1
+