From d3498262c5db82eb487bec09cb8d4a3bedbc8ece Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Fri, 20 Feb 2026 09:23:04 -0500 Subject: [PATCH] [cr147][Android] Move OmniboxActionDelegateImpl back to omnibox folder Chromium changes: https://chromium.googlesource.com/chromium/src/+/f3299a56bec5f5f0848d62984e01defc3a7f0499 commit f3299a56bec5f5f0848d62984e01defc3a7f0499 Author: Tomasz Wiszkowski Date: Wed Feb 18 07:11:44 2026 -0800 Move OmniboxActionDelegateImpl back to omnibox folder. The change reverts https://crrev.com/c/7077115 and exposes the OmniboxActionDelegateImpl to the Autocomplete subsystem. The OmniboxActionDelegate (the interface) is needed to bridge the gap between the //chrome/android and //components, and its function under //chrome/android is irrelevant. Propagating the Impl down to Autocomplete stack allows us to include additional bits of information needed by Omnibox Actions that should not be a part of the interface / should not be modifiable by Actions. Bypass-Check-License: files moved. Change-Id: I9842386460f91f476a3bb309e1a7f8b31251990c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7586837 Reviewed-by: Keigo Oka Auto-Submit: Tomasz Wiszkowski Commit-Queue: Tomasz Wiszkowski Reviewed-by: Hidehiko Abe Cr-Commit-Position: refs/heads/main@{#1586414} --- .../chrome/browser/feed/BraveFeedSurfaceCoordinator.java | 4 ++-- .../org/chromium/chrome/browser/ntp/BraveNewTabPage.java | 4 +++- .../browser/omnibox/BraveLocationBarCoordinator.java | 4 ++-- .../omnibox/suggestions/BraveAutocompleteMediator.java | 4 ++-- .../chrome/browser/toolbar/BraveToolbarManager.java | 4 ++-- .../org/chromium/chrome/browser/BytecodeTest.java | 8 ++++---- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java index b88472a0778..0b1cc31a493 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java @@ -62,7 +62,7 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator { FeedSwipeRefreshLayout swipeRefreshLayout, boolean overScrollDisabled, @Nullable ViewGroup viewportView, - FeedActionDelegate actionDelegate, + FeedSurfaceCoordinator.ActionDelegateFactory createActionDelegate, NonNullObservableSupplier tabStripHeightSupplier, MonotonicObservableSupplier edgeToEdgeControllerSupplier, @Nullable ModuleRegistry moduleRegistry) { @@ -86,7 +86,7 @@ public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator { swipeRefreshLayout, overScrollDisabled, viewportView, - actionDelegate, + createActionDelegate, tabStripHeightSupplier, edgeToEdgeControllerSupplier, moduleRegistry); diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index e2ea11eebc7..12d4a582d54 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -151,9 +151,11 @@ public class BraveNewTabPage extends NewTabPage { protected void initializeMainView( Activity activity, WindowAndroid windowAndroid, + ActivityResultTracker activityResultTracker, SnackbarManager snackbarManager, boolean isInNightMode, Supplier<@Nullable ShareDelegate> shareDelegateSupplier, + Supplier<@Nullable ModalDialogManager> modalDialogManagerSupplier, String url, MonotonicObservableSupplier edgeToEdgeControllerSupplier, StartupMetricsTracker startupMetricsTracker) { @@ -208,7 +210,7 @@ public class BraveNewTabPage extends NewTabPage { actionDelegate, mTabStripHeightSupplier, edgeToEdgeControllerSupplier, - /*moduleRegistry */ null); + /* moduleRegistry= */ null); mFeedSurfaceProvider = feedSurfaceCoordinator; } diff --git a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java index 65d60870030..fa1f9efcac2 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/BraveLocationBarCoordinator.java @@ -26,6 +26,7 @@ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; import org.chromium.chrome.browser.omnibox.LocationBarMediator.OmniboxUma; import org.chromium.chrome.browser.omnibox.status.StatusCoordinator.PageInfoAction; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; +import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; @@ -37,7 +38,6 @@ import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinato import org.chromium.chrome.browser.ui.edge_to_edge.TopInsetProvider; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.components.browser_ui.accessibility.PageZoomManager; -import org.chromium.components.omnibox.action.OmniboxActionDelegate; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; @@ -84,7 +84,7 @@ public class BraveLocationBarCoordinator extends LocationBarCoordinator { BooleanSupplier isToolbarMicEnabledSupplier, @Nullable Supplier merchantTrustSignalsCoordinatorSupplier, - OmniboxActionDelegate omniboxActionDelegate, + OmniboxActionDelegateImpl omniboxActionDelegate, @Nullable BrowserStateBrowserControlsVisibilityDelegate browserControlsVisibilityDelegate, @Nullable BackPressManager backPressManager, diff --git a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java index a6cee8ec20e..c9fdd0f8c79 100644 --- a/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -18,6 +18,7 @@ import org.chromium.chrome.browser.omnibox.DeferredIMEWindowInsetApplicationCall import org.chromium.chrome.browser.omnibox.LocationBarDataProvider; import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.fusebox.FuseboxCoordinator; +import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult; @@ -25,7 +26,6 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.components.omnibox.action.OmniboxActionDelegate; import org.chromium.components.user_prefs.UserPrefs; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; @@ -64,7 +64,7 @@ class BraveAutocompleteMediator extends AutocompleteMediator LocationBarDataProvider locationBarDataProvider, Callback bringTabGroupToFrontCallback, BookmarkState bookmarkState, - OmniboxActionDelegate omniboxActionDelegate, + OmniboxActionDelegateImpl omniboxActionDelegate, ActivityLifecycleDispatcher lifecycleDispatcher, OmniboxSuggestionsDropdownEmbedder embedder, WindowAndroid windowAndroid, diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 2ee55c9097d..73871c4a1a8 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -53,6 +53,7 @@ import org.chromium.chrome.browser.merchant_viewer.MerchantTrustSignalsCoordinat import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; import org.chromium.chrome.browser.omnibox.LocationBar; import org.chromium.chrome.browser.omnibox.OmniboxChipManager; +import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; import org.chromium.chrome.browser.preferences.ChromePreferenceKeys; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.readaloud.ReadAloudController; @@ -99,7 +100,6 @@ import org.chromium.components.browser_ui.accessibility.PageZoomManager; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager; import org.chromium.components.browser_ui.widget.scrim.ScrimManager; -import org.chromium.components.omnibox.action.OmniboxActionDelegate; import org.chromium.misc_metrics.mojom.MiscAndroidMetrics; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modaldialog.ModalDialogManager; @@ -205,7 +205,7 @@ public class BraveToolbarManager extends ToolbarManager TabContentManager tabContentManager, TabCreatorManager tabCreatorManager, Supplier merchantTrustSignalsCoordinatorSupplier, - OmniboxActionDelegate omniboxActionDelegate, + OmniboxActionDelegateImpl omniboxActionDelegate, Supplier ephemeralTabCoordinatorSupplier, boolean initializeWithIncognitoColors, @Nullable BackPressManager backPressManager, diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index ba8d7808360..9b1b807a706 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -115,6 +115,7 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteUIContext; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder; import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener; import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost; +import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionDelegateImpl; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; import org.chromium.chrome.browser.open_in_app.OpenInAppMenuItemProvider; import org.chromium.chrome.browser.password_manager.PasswordManagerHelper; @@ -201,7 +202,6 @@ import org.chromium.components.external_intents.ExternalNavigationDelegate; import org.chromium.components.feature_engagement.Tracker; import org.chromium.components.offline_items_collection.OfflineItem; import org.chromium.components.omnibox.AutocompleteMatch; -import org.chromium.components.omnibox.action.OmniboxActionDelegate; import org.chromium.components.permissions.PermissionDialogDelegate; import org.chromium.components.prefs.PrefService; import org.chromium.components.search_engines.TemplateUrl; @@ -1481,7 +1481,7 @@ public class BytecodeTest { TabContentManager.class, TabCreatorManager.class, Supplier.class, - OmniboxActionDelegate.class, + OmniboxActionDelegateImpl.class, Supplier.class, boolean.class, BackPressManager.class, @@ -1673,7 +1673,7 @@ public class BytecodeTest { LocationBarDataProvider.class, Callback.class, BookmarkState.class, - OmniboxActionDelegate.class, + OmniboxActionDelegateImpl.class, ActivityLifecycleDispatcher.class, OmniboxSuggestionsDropdownEmbedder.class, WindowAndroid.class, @@ -1777,7 +1777,7 @@ public class BytecodeTest { BookmarkState.class, BooleanSupplier.class, Supplier.class, - OmniboxActionDelegate.class, + OmniboxActionDelegateImpl.class, BrowserStateBrowserControlsVisibilityDelegate.class, BackPressManager.class, OmniboxSuggestionsDropdownScrollListener.class,