Browser: fix tabs not accessible due to tab group value

From 0d2ab70ad5ede11266766f8fd6bc28eeb5208823 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Tue, 10 Oct 2023 16:32:44 +0530

Subject: [PATCH 4/4] Browser: Avoid using cached legacy pref value for tab

 group

---

 .../chromium/chrome/browser/flags/ChromeFeatureList.java    | 3 +--

 .../chrome/browser/preferences/ChromePreferenceKeys.java    | 6 ------

 .../browser/preferences/LegacyChromePreferenceKeys.java     | 1 -

 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

index 6c9ff405e9d74..a2fd445ba0c6c 100644

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -611,8 +611,7 @@ public abstract class ChromeFeatureList {

             new CachedFlag(TAB_DRAG_DROP_ANDROID, false);

     public static final CachedFlag sTabGridLayoutAndroid = new CachedFlag(TAB_GRID_LAYOUT_ANDROID,

             ChromePreferenceKeys.FLAGS_CACHED_GRID_TAB_SWITCHER_ENABLED, true);

-    public static final CachedFlag sTabGroupsAndroid = new CachedFlag(

-            TAB_GROUPS_ANDROID, ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED, true);

+    public static final CachedFlag sTabGroupsAndroid = new CachedFlag(TAB_GROUPS_ANDROID, true);

     public static final CachedFlag sTabGroupsContinuationAndroid =

             new CachedFlag(TAB_GROUPS_CONTINUATION_ANDROID, true);

     public static final CachedFlag sTabGroupsForTablets =

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 8f0abc824068f..9b182c8970189 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

@@ -357,12 +357,6 @@ public final class ChromePreferenceKeys {

      */

     public static final String FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT =

             "swap_pixel_format_to_fix_convert_from_translucent";

-    /**

-     * Whether or not the tab group is enabled.

-     * Default value is false.

-     */

-    public static final String FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED =

-            "tab_group_android_enabled";

     /** See CachedFeatureFlags.getLastCachedMinimalBrowserFlagsTimeMillis(). */

     public static final String FLAGS_LAST_CACHED_MINIMAL_BROWSER_FLAGS_TIME_MILLIS =

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..01b1f907afd01 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

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

                 ChromePreferenceKeys.FLAGS_CACHED_NETWORK_SERVICE_WARM_UP_ENABLED,

                 ChromePreferenceKeys.FLAGS_CACHED_START_SURFACE_ENABLED,

                 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,

-- 

2.34.1

0001-Disable-Play-services-dependent-password-manager-fea.patch

0002-Browser-Remove-some-preferences-from-UI.patch

0003-Browser-fix-adblock-rebranding.patch

0004-Browser-Avoid-using-cached-legacy-pref-value-for-tab.patch