Browser: Update browser patches for 116.0.5845.163

    chromium_dir=$root_dir

fi

date_time=$(date '+%Y%m%d%H%M%S')

chromium_version="108.0.5359.156"

chromium_version="116.0.5845.163"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

clean=0

gsync=0

    apks="ChromePublic SystemWebView TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432"

    build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

    if [ $1 '==' "x86" ] || [ $1 '==' "x64" ]; then

        build_args+=' is_cfi=false'

        build_args+=' use_cfi_cast=false'

    else

        build_args+=' is_cfi=true'

        build_args+=' use_cfi_cast=true'

    fi

    code=$chromium_code

    if [ $1 '==' "arm" ]; then

        code+=00

android_channel="stable"

blink_symbol_level=1

build_contextual_search=false

build_with_tflite_lib=false

build_with_tflite_lib=true

chrome_pgo_phase=0

dcheck_always_on=false

debuggable_apks=false

dfmify_dev_ui=false

disable_android_lint=true

disable_autofill_assistant_dfm=true

disable_fieldtrial_testing_config=true

disable_tab_ui_dfm=true

enable_arcore=false

enable_av1_decoder=true

enable_cardboard=false

enable_dav1d_decoder=true

enable_gvr_services=false

enable_hangout_services_extension=false

enable_mdns=false

enable_mse_mpeg2ts_stream_parser=true

enable_nacl=false

enable_openxr=false

enable_platform_dolby_vision=true

enable_platform_hevc=true

enable_remoting=false

exclude_unwind_tables=false

ffmpeg_branding="Chrome"

icu_use_data_file=true

#is_cfi=true

is_cfi=false

use_relative_vtables_abi=true

is_component_build=false

is_debug=false

is_official_build=true

proprietary_codecs=true

rtc_build_examples=false

safe_browsing_mode=0

symbol_level=1

#system_webview_package_name="org.bromite.webview"

target_os="android"

treat_warnings_as_errors=true

#use_cfi_cast=true

use_cfi_cast=true

use_debug_fission=true

use_errorprone_java_compiler=false

use_gnome_keyring=false

use_official_google_api_keys=false

use_rtti=false

use_stable_package_name_for_trichrome=false

use_sysroot=false

webview_includes_weblayer=false

webview_includes_weblayer=true

chrome_public_manifest_package = "foundation.e.browser"

trichrome_library_package = "org.chromium.trichromelibrary"

From 9434796b9ccfb96e86bae3457d29abba370252b3 Mon Sep 17 00:00:00 2001

From 40dbcbda0cdc25953cf9b9f4d683bd126d7b17ff Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

Date: Thu, 27 May 2021 07:30:02 -0400

Subject: [PATCH 01/32] add trichrome browser apk targets

---

 chrome/android/BUILD.gn | 61 ++++++++++++++++++++++++++++++++++++++++-

 1 file changed, 60 insertions(+), 1 deletion(-)

 chrome/android/BUILD.gn                   | 35 +++++++++++++++++++++++

 chrome/android/chrome_public_apk_tmpl.gni |  2 ++

 2 files changed, 37 insertions(+)

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index 8cd50c454b578..505b23eafe956 100644

index 50967a14f3337..37263124c7d62 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -2303,6 +2303,10 @@ if (current_toolchain == default_toolchain) {

     is_monochrome = true

@@ -2288,6 +2288,10 @@ if (current_toolchain == default_toolchain) {

     is_trichrome = true

     is_bundle_module = true

   }

+  resource_packaging("trichrome_chrome_apk_pak_assets") {

+    is_monochrome = false

+    is_trichrome = true

+  }

   resource_packaging("trichrome_chrome_bundle_module_pak_assets") {

     is_monochrome = false

     is_trichrome = true

@@ -2830,7 +2834,7 @@ if (current_toolchain == default_toolchain) {

       if (trichrome_synchronized_proguard) {

         webview_target = "//android_webview:trichrome_webview_apk"

-        chrome_target = ":trichrome_chrome_bundle"

+        chrome_target = ":trichrome_chrome_apk"

       }

       if (_enable_manifest_verification) {

@@ -2885,6 +2889,61 @@ if (current_toolchain == default_toolchain) {

   # Exists separately from chrome_public_base_module_java_for_test to allow

   # downstream to depend on test support packages without needing to depend on

@@ -2624,6 +2628,37 @@ if (current_toolchain == default_toolchain) {

       }

     }

   }

+ 

+monochrome_public_apk_or_module_tmpl("trichrome_chrome_apk") {

+  version_code = trichrome_version_code

+  version_name = chrome_version_name

+  chrome_public_apk_or_module_tmpl("trichrome_chrome_apk") {

+    apk_name = "TrichromeChrome"

+    is_trichrome = true

+    target_type = "android_apk"

+  use_trichrome_library = true

+    static_library_provider = ":trichrome_library_apk"

+  if (!is_java_debug) {

+    static_library_synchronized_proguard = trichrome_synchronized_proguard

+    if (trichrome_synchronized_proguard) {

+      resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"

+    }

+  }

+    if (android_64bit_target_cpu) {

+      is_64_bit_browser = false

+      include_64_bit_webview = true

+  }

+  

+  if (android_64bit_target_cpu) {

+  monochrome_public_apk_or_module_tmpl("trichrome_chrome_64_32_apk") {

+    version_code = trichrome_version_code

+    version_name = chrome_version_name

+    chrome_public_apk_or_module_tmpl("trichrome_chrome_64_32_apk") {

+      apk_name = "TrichromeChrome6432"

+      is_trichrome = true

+      target_type = "android_apk"

+    use_trichrome_library = true

+      static_library_provider = ":trichrome_library_64_32_apk"

+    if (!is_java_debug) {

+      static_library_synchronized_proguard = trichrome_synchronized_proguard

+      if (trichrome_synchronized_proguard) {

+        resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"

+      }

+    }

+      is_64_bit_browser = true

+      include_32_bit_webview = true

+    }

+  

+  monochrome_public_apk_or_module_tmpl("trichrome_chrome_64_apk") {

+    version_code = trichrome_version_code

+    version_name = chrome_version_name

+    chrome_public_apk_or_module_tmpl("trichrome_chrome_64_apk") {

+      apk_name = "TrichromeChrome64"

+      is_trichrome = true

+      target_type = "android_apk"

+    use_trichrome_library = true

+      static_library_provider = ":trichrome_library_64_apk"

+    if (!is_java_debug) {

+      static_library_synchronized_proguard = trichrome_synchronized_proguard

+      if (trichrome_synchronized_proguard) {

+        resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"

+      }

+    }

+      is_64_bit_browser = true

+      include_32_bit_webview = false

+    }

+  }

   chrome_public_unit_test_apk_manifest =

       "$root_gen_dir/chrome_public_unit_test_apk_manifest/AndroidManifest.xml"

   # As compared to chrome_public_test_apk, this target contains only unit tests

   # that require on device capabilities. These tests are smaller, more tightly

diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni

index bb5974ff9e5cc..a52989583c10f 100644

--- a/chrome/android/chrome_public_apk_tmpl.gni

+++ b/chrome/android/chrome_public_apk_tmpl.gni

@@ -454,6 +454,8 @@ template("chrome_common_apk_or_module_tmpl") {

       deps += [ "//chrome/android:chrome_bundle_module_pak_assets" ]

     } else if (_is_monochrome) {

       deps += [ "//chrome/android:monochrome_apk_pak_assets" ]

+    } else if (_is_trichrome) {

+      deps += [ "//chrome/android:trichrome_chrome_apk_pak_assets" ]

     } else {

       assert(!_is_trichrome)

       deps += [ "//chrome/android:chrome_apk_pak_assets" ]

-- 

2.25.1

2.34.1

From 0920c7fb77cba9f4d61d9ea6bd5a82a15c35238a Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 27 Sep 2023 20:38:00 +0530

Subject: [PATCH 2/5] Revert "Add option to force tablet UI"

This reverts commit 028be265dffbc175671a342978e11579e7c33dd9.

---

 .../ChromeAccessibilitySettingsDelegate.java  | 19 -------------------

 .../preferences/ChromePreferenceKeys.java     |  1 -

 .../LegacyChromePreferenceKeys.java           |  1 -

 .../omnibox/LocationBarCoordinator.java       |  2 +-

 .../strings/android_chrome_strings.grd        |  6 ------

 .../toolbar/top/ToolbarControlContainer.java  |  5 +++--

 components/BUILD.gn                           |  6 +++---

 .../res/xml/accessibility_preferences.xml     |  5 -----

 .../accessibility/AccessibilitySettings.java  | 11 -----------

 .../AccessibilitySettingsDelegate.java        |  2 --

 ui/android/BUILD.gn                           |  2 --

 .../chromium/ui/base/DeviceFormFactor.java    |  5 -----

 12 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

index 7e35ced51b523..16adf88cd50f7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java

@@ -77,25 +77,6 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting

         return new ReaderForAccessibilityDelegate(mProfile);

     }

-    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {

-        @Override

-        public boolean isEnabled() {

-            return SharedPreferencesManager.getInstance().readBoolean(

-                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false);

-        }

-

-        @Override

-        public void setEnabled(boolean value) {

-            SharedPreferencesManager.getInstance().writeBoolean(

-                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value);

-        }

-    }

-

-    @Override

-    public BooleanPreferenceDelegate getForceTabletUIDelegate() {

-        return new ForceTabletUIDelegate();

-    }

-

     @Override

     public void addExtraPreferences(PreferenceFragmentCompat fragment) {

         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {

diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

index a6978010c728a..6310df0220d8d 100644

--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

@@ -386,7 +386,6 @@ public final class ChromePreferenceKeys {

             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;

     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";

-    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";

     /** Keys used to save settings related to homepage. */

     public static final String HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";

diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

index 92f7a055d6bac..3663a9ee67edf 100644

--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java

@@ -65,7 +65,6 @@ public class LegacyChromePreferenceKeys {

                 ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,

                 ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,

                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,

-                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,

                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,

                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,

                 ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,

diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

index f16a29455a70a..15cbf67717d30 100644

--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java

@@ -669,7 +669,7 @@ public class LocationBarCoordinator

     }

     private boolean isTabletWindow() {

-        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout();

+        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid);

     }

     /* package */ LocationBarMediator getMediatorForTesting() {

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd

index 46624154c1715..63829971fc878 100644

--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd

+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -1730,12 +1730,6 @@ Your Google account may have other forms of browsing history like searches and a

       <message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">

         Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps

       </message>

-      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">

-       Open chromium in Tablet Mode

-      </message>

-      <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">

-        Force Tablet Mode

-      </message>

       <!-- Safety check -->

       <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

index c42c7556b58ed..d4a92457789e1 100644

--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java

@@ -165,8 +165,9 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con

             return backgroundDrawable;

         } else {

-            Drawable backgroundDrawable = new ColorDrawable(

-                    ChromeColors.getPrimaryBackgroundColor(getContext(), incognito));

+            final Drawable backgroundDrawable =

+                    AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)

+                            .mutate();

             backgroundDrawable.setTint(ChromeColors.getDefaultThemeColor(getContext(), incognito));

             backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);

diff --git a/components/BUILD.gn b/components/BUILD.gn

index 1227c584867d0..fb3af484189fc 100644

--- a/components/BUILD.gn

+++ b/components/BUILD.gn

@@ -68,7 +68,7 @@ if (is_ios) {

 # Omit Lacros because it allows //components to depend on //chrome, which in

 # turn depends on //extensions.

-if (!is_chromeos_lacros && !is_android) {

+if (!is_chromeos_lacros) {

   disallowed_extension_deps_ = [

     # Components should largely not depend on //extensions. Since // extensions

     # is not a component target and is linked with //chrome, depending on most

@@ -730,7 +730,7 @@ test("components_unittests") {

   # On other platforms, no components should depend on Chrome.

   # Since //chrome depends on //extensions, we also only assert_no_deps on

   # extensions targets for non-lacros builds.

-  if (!is_chromeos_lacros  && !is_android) {

+  if (!is_chromeos_lacros) {

     assert_no_deps = [ "//chrome/*" ]

     assert_no_deps += disallowed_extension_deps_

   }

@@ -1018,7 +1018,7 @@ if (use_blink) {

     # dependency. On other platforms, no components should depend on Chrome.

     # Since //chrome depends on //extensions, we also only assert_no_deps on

     # extensions targets for non-lacros builds.

-    if (!is_chromeos_lacros  && !is_android) {

+    if (!is_chromeos_lacros) {

       assert_no_deps = [ "//chrome/*" ]

       assert_no_deps += disallowed_extension_deps_

     }

diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

index 62207fd4bec14..533e57e78ab61 100644

--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml

@@ -41,11 +41,6 @@ found in the LICENSE file.

         android:summary="@string/accessibility_tab_switcher_summary"

         android:title="@string/accessibility_tab_switcher_title" />

-    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference

-        android:key="force_tablet_ui"

-        android:summary="@string/force_tablet_ui_summary"

-        android:title="@string/force_tablet_ui_title" />

-

     <Preference

         android:key="captions"

         android:title="@string/accessibility_captions_title"/>

diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

index 97ccef87e5829..a2face639f50a 100644

--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java

@@ -14,7 +14,6 @@ import androidx.preference.PreferenceFragmentCompat;

 import org.chromium.base.ContextUtils;

 import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;

 import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;

-import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;

 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;

 import org.chromium.components.browser_ui.settings.CustomDividerFragment;

 import org.chromium.components.browser_ui.settings.SettingsUtils;

@@ -34,8 +33,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

     public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility";

     public static final String PREF_CAPTIONS = "captions";

-    private BooleanPreferenceDelegate mForceTabletUIDelegate;

-    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";

     private TextScalePreference mTextScalePref;

     private PageZoomPreference mPageZoomDefaultZoomPref;

     private ChromeSwitchPreference mPageZoomAlwaysShowPref;

@@ -115,12 +112,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

             getPreferenceScreen().removePreference(readerForAccessibilityPref);

         }

-        ChromeBaseCheckBoxPreference forceTabletUiPref =

-                (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI);

-        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();

-        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());

-        forceTabletUiPref.setOnPreferenceChangeListener(this);

-

         ChromeSwitchPreference accessibilityTabSwitcherPref =

                 (ChromeSwitchPreference) findPreference(

                         AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);

@@ -177,8 +168,6 @@ public class AccessibilitySettings extends PreferenceFragmentCompat

             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);

         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {

             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);

-        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {

-            mForceTabletUIDelegate.setEnabled((Boolean) newValue);

         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {

             if (mReaderForAccessibilityDelegate != null) {

                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);

diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

index 41a0726e9bad8..f1a4f4a02c056 100644

--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java

@@ -44,8 +44,6 @@ public interface AccessibilitySettingsDelegate {

      */

     BooleanPreferenceDelegate getReaderForAccessibilityDelegate();

-    BooleanPreferenceDelegate getForceTabletUIDelegate();

-

     /**

      * Allows the embedder to add more preferences to the preference screen.

      *

diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn

index c548631abe029..b47847845ca31 100644

--- a/ui/android/BUILD.gn

+++ b/ui/android/BUILD.gn

@@ -408,8 +408,6 @@ android_library("ui_no_recycler_view_java") {

     ":ui_android_features_java",

     ":ui_java_resources",

     ":ui_utils_java",

-    # dependency for ui_no_recycler_view_java

-    "//chrome/browser/preferences:java",

     "//base:base_java",

     "//base:jni_java",

     "//build/android:build_java",

diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

index 3df825d11052e..b7efa9f648f31 100644

--- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

+++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java

@@ -12,8 +12,6 @@ import androidx.annotation.VisibleForTesting;

 import org.chromium.base.ContextUtils;

 import org.chromium.base.ThreadUtils;

 import org.chromium.base.annotations.CalledByNative;

-import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

-import org.chromium.chrome.browser.preferences.SharedPreferencesManager;

 import org.chromium.ui.R;

 import org.chromium.ui.display.DisplayAndroid;

 import org.chromium.ui.display.DisplayUtil;

@@ -64,9 +62,6 @@ public class DeviceFormFactor {

      *         E.g. http://developer.samsung.com/samsung-dex/testing

      */

     public static boolean isNonMultiDisplayContextOnTablet(Context context) {

-        if (SharedPreferencesManager.getInstance().readBoolean(

-                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false))

-            return true;

         return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;

     }

-- 

2.34.1