From 468dad7ca51b26a7c226d4330def686149ebfd30 Mon Sep 17 00:00:00 2001 From: AlexeyBarabash Date: Mon, 16 Mar 2026 14:34:30 +0200 Subject: [PATCH] [cr148][Android] ResourceButtonData moved to ui/actions package Update import for ResourceButtonData which was moved from org.chromium.chrome.browser.hub to org.chromium.chrome.browser.ui.actions. Chromium change: https://source.chromium.org/chromium/chromium/src/+/d364b657773ea7874b8ba6781d44cb9c2e54f55f commit d364b657773ea7874b8ba6781d44cb9c2e54f55f Author: Dan Polanco Date: Wed Mar 11 15:05:22 2026 -0700 Create ui/actions and move generic ButtonData Moves DisplayButtonData, FullButtonData, and their generic implementations out of the hub package into chrome/browser/ui/android/actions. Bug: 483096892 Bypass-Check-License: Rename/move files. Change-Id: I9701129bf1d86ea20ac2786c9c66aa9778f1c64a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7654411 Reviewed-by: Calder Kitagawa Commit-Queue: Calder Kitagawa Auto-Submit: Dan Polanco Commit-Queue: Dan Polanco Cr-Commit-Position: refs/heads/main@{#1598021} --- .../tasks/tab_management/BraveIncognitoTabSwitcherPane.java | 2 +- android/javatests/org/chromium/chrome/browser/BytecodeTest.java | 2 +- test/BUILD.gn | 1 + 3 files changed, 3 insertions(+), 2 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 c8bd76dcf4f..e036dc1c9be 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 @@ -15,9 +15,9 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.build.annotations.NullMarked; import org.chromium.build.annotations.Nullable; import org.chromium.chrome.browser.compositor.CompositorViewHolder; -import org.chromium.chrome.browser.hub.ResourceButtonData; import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController; import org.chromium.chrome.browser.tabmodel.TabGroupModelFilter; +import org.chromium.chrome.browser.ui.actions.ResourceButtonData; import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController; import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.tab_ui.R; diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 14ec31fb0d2..b384eb29125 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -84,7 +84,6 @@ 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.homepage.settings.BraveRadioButtonGroupHomepagePreference; -import org.chromium.chrome.browser.hub.ResourceButtonData; import org.chromium.chrome.browser.infobar.InfoBarContainerView; import org.chromium.chrome.browser.layouts.LayoutManager; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; @@ -154,6 +153,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback; import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer; import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionHandler; +import org.chromium.chrome.browser.ui.actions.ResourceButtonData; import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate; diff --git a/test/BUILD.gn b/test/BUILD.gn index 82d67cbcb64..54a9357ad96 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1556,6 +1556,7 @@ if (is_android) { "//chrome/browser/tab:java", "//chrome/browser/tab_ui/android:java", "//chrome/browser/tabmodel:java", + "//chrome/browser/ui/android/actions:java", "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/desktop_windowing:java", "//chrome/browser/ui/android/edge_to_edge:java",