From 3168e199507d936f9774e6bf516ae00a781faabf Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Thu, 24 Apr 2025 12:04:25 -0400
Subject: [PATCH] [cr137] [Android] Fix Private 'new tab group' menu option

Chromium change:
https://chromium.googlesource.com/chromium/src/+/39ca7116fe0ebd90b44a8fff3d2c12a819db8b1c

[Tab Group Entry Points] Fix Incognito 'new tab group' menu option

- The incognito version of this functionality was disabled,
	and this CL should fix it
- Rename TabGroupCreationUiFlow to TabGroupCreationUiFlowDelegate

Bug: 413062615
---
 .../tasks/tab_management/BraveIncognitoTabSwitcherPane.java   | 4 ++--
 .../tasks/tab_management/BraveTabSwitcherPaneBase.java        | 4 ++--
 .../javatests/org/chromium/chrome/browser/BytecodeTest.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java
index 06ff8c44f7c..755789826fe 100644
--- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java
+++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveIncognitoTabSwitcherPane.java
@@ -37,7 +37,7 @@ public class BraveIncognitoTabSwitcherPane extends IncognitoTabSwitcherPane {
             @NonNull UserEducationHelper userEducationHelper,
             @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier,
             @NonNull ObservableSupplier<CompositorViewHolder> compositorViewHolderSupplier,
-            @NonNull TabGroupCreationUiFlow tabGroupCreationUiFlow) {
+            @NonNull TabGroupCreationUiDelegate tabGroupCreationUiDelegate) {
         super(
                 context,
                 factory,
@@ -48,7 +48,7 @@ public class BraveIncognitoTabSwitcherPane extends IncognitoTabSwitcherPane {
                 userEducationHelper,
                 edgeToEdgeSupplier,
                 compositorViewHolderSupplier,
-                tabGroupCreationUiFlow);
+                tabGroupCreationUiDelegate);
 
         ResourceButtonData newReferenceButtonData =
                 new ResourceButtonData(
diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java
index e66913d8df7..9ca34dee5c0 100644
--- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java
+++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabSwitcherPaneBase.java
@@ -29,7 +29,7 @@ public abstract class BraveTabSwitcherPaneBase extends TabSwitcherPaneBase {
             @NonNull UserEducationHelper userEducationHelper,
             @NonNull ObservableSupplier<EdgeToEdgeController> edgeToEdgeSupplier,
             @NonNull ObservableSupplier<CompositorViewHolder> compositorViewHolderSupplier,
-            @NonNull TabGroupCreationUiFlow tabGroupCreationUiFlow) {
+            @NonNull TabGroupCreationUiDelegate tabGroupCreationUiDelegate) {
         super(
                 context,
                 factory,
@@ -38,7 +38,7 @@ public abstract class BraveTabSwitcherPaneBase extends TabSwitcherPaneBase {
                 userEducationHelper,
                 edgeToEdgeSupplier,
                 compositorViewHolderSupplier,
-                tabGroupCreationUiFlow);
+                tabGroupCreationUiDelegate);
     }
 
     @Override
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index a045dbc9a57..1447417a0eb 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -121,7 +121,7 @@ import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tasks.HomeSurfaceTracker;
-import org.chromium.chrome.browser.tasks.tab_management.TabGroupCreationUiFlow;
+import org.chromium.chrome.browser.tasks.tab_management.TabGroupCreationUiDelegate;
 import org.chromium.chrome.browser.tasks.tab_management.TabSwitcherPaneCoordinatorFactory;
 import org.chromium.chrome.browser.theme.ThemeColorProvider;
 import org.chromium.chrome.browser.theme.TopUiThemeColorProvider;
@@ -1827,7 +1827,7 @@ public class BytecodeTest {
                         UserEducationHelper.class,
                         ObservableSupplier.class,
                         ObservableSupplier.class,
-                        TabGroupCreationUiFlow.class));
+                        TabGroupCreationUiDelegate.class));
 
         Assert.assertTrue(
                 constructorsMatch(