Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr149][Android] Changes for TabbedAdaptiveToolbarBehavior

Browse Source 
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}
This commit is contained in:
Artem Samoilenko
2026-05-22 16:24:55 -04:00
committed by Max Karolinskiy
parent 24e1cd6e6f
commit aad5b0bfa2
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehavior.java
+2 -1
View File
@@ -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,
android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+3 -2
View File
@@ -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",
android/junit/BUILD.gn
+1
View File
@@ -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",
android/junit/src/org/chromium/chrome/browser/tabbed_mode/BraveTabbedAdaptiveToolbarBehaviorTest.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class BraveTabbedAdaptiveToolbarBehaviorTest {
tabModelSelectorSupplier,
modalDialogManagerSupplier,
tabStripVisibilitySupplier,
() -> {});
preventClose -> {});
}
@After