From aad5b0bfa28d313cd9e668771722793b7e278dc0 Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Wed, 15 Apr 2026 10:31:56 -0400
Subject: [PATCH] [cr149][Android] Changes for TabbedAdaptiveToolbarBehavior

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/bf83a63ce609a05fa1cbd9ad85b37920c3aa9e8d

commit bf83a63ce609a05fa1cbd9ad85b37920c3aa9e8d
Author: Hailey Wang <haileywang@google.com>
Date:   Mon Apr 13 15:16:05 2026 -0700

    [Glic] Make toggleGlic callback accept a boolean

    Bug: 498721993
    Change-Id: Ide0b83be60599c4ffa7c1b1e18d2340d2e6feab1
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7747038
    Commit-Queue: Hailey Wang <haileywang@google.com>
    Reviewed-by: Wenyu Fu <wenyufu@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1614006}
---
 .../tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java      | 3 ++-
 .../javatests/org/chromium/chrome/browser/BytecodeTest.java  | 5 +++--
 android/junit/BUILD.gn                                       | 1 +
 .../tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java
index b4fd8a0701c..070e949d2a0 100644
--- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java
+++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java
@@ -14,6 +14,7 @@ import org.chromium.build.annotations.Nullable;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.bookmarks.TabBookmarker;
+import org.chromium.chrome.browser.glic.GlicToolbarButtonController;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.tab_group_suggestion.toolbar.GroupSuggestionsButtonController;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
@@ -55,7 +56,7 @@ public class BraveTabbedAdaptiveToolbarBehavior extends TabbedAdaptiveToolbarBeh
             Supplier<TabModelSelector> tabModelSelectorSupplier,
             Supplier<ModalDialogManager> modalDialogManagerSupplier,
             MonotonicObservableSupplier<@StripVisibilityState Integer> tabStripVisibilitySupplier,
-            Runnable toggleGlicCallback) {
+            GlicToolbarButtonController.GlicButtonDelegate toggleGlicCallback) {
         super(
                 context,
                 activityLifecycleDispatcher,
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 6d290497700..9117e39db9b 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -82,6 +82,7 @@ import org.chromium.chrome.browser.feed.webfeed.WebFeedSnackbarController;
 import org.chromium.chrome.browser.findinpage.FindToolbarManager;
 import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
+import org.chromium.chrome.browser.glic.GlicToolbarButtonController;
 import org.chromium.chrome.browser.homepage.settings.BraveRadioButtonGroupHomepagePreference;
 import org.chromium.chrome.browser.hub.HubShowPaneHelper;
 import org.chromium.chrome.browser.hub.PaneListBuilder;
@@ -2288,7 +2289,7 @@ public class BytecodeTest {
                 constructorsMatch(
                         "org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior",
                         "org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior", // presubmit: ignore-long-line
-                        Context.class,
+                        Activity.class,
                         ActivityLifecycleDispatcher.class,
                         Supplier.class,
                         Supplier.class,
@@ -2299,7 +2300,7 @@ public class BytecodeTest {
                         Supplier.class,
                         Supplier.class,
                         MonotonicObservableSupplier.class,
-                        Runnable.class));
+                        GlicToolbarButtonController.GlicButtonDelegate.class));
         Assert.assertTrue(
                 constructorsMatch(
                         "org/chromium/chrome/browser/SwipeRefreshHandler",
diff --git a/android/junit/BUILD.gn b/android/junit/BUILD.gn
index 04dfd586e73..27594c1d57e 100644
--- a/android/junit/BUILD.gn
+++ b/android/junit/BUILD.gn
@@ -34,6 +34,7 @@ if (is_android) {
 
     deps = [
       "//chrome/android/junit:chrome_junit_tests_helper",
+      "//chrome/browser/glic/android:java",
       "//chrome/browser/tab_group_suggestion:toolbar_java",
       "//chrome/browser/ui/messages/android:java",
       "//components/browser_ui/accessibility/android:page_zoom_utils_java",
diff --git a/android/junit/src/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java b/android/junit/src/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java
index 2ac1ca4dfa2..3590b9dea32 100644
--- a/android/junit/src/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java
+++ b/android/junit/src/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java
@@ -71,7 +71,7 @@ public class BraveTabbedAdaptiveToolbarBehaviorTest {
                         tabModelSelectorSupplier,
                         modalDialogManagerSupplier,
                         tabStripVisibilitySupplier,
-                        () -> {});
+                        preventClose -> {});
     }
 
     @After