[cr147][Android] Move OmniboxActionDelegateImpl back to omnibox folder
Chromium changes: https://chromium.googlesource.com/chromium/src/+/f3299a56bec5f5f0848d62984e01defc3a7f0499 commit f3299a56bec5f5f0848d62984e01defc3a7f0499 Author: Tomasz Wiszkowski <ender@google.com> 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 <oka@chromium.org> Auto-Submit: Tomasz Wiszkowski <ender@google.com> Commit-Queue: Tomasz Wiszkowski <ender@google.com> Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Cr-Commit-Position: refs/heads/main@{#1586414}
This commit is contained in:
@@ -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<EdgeToEdgeController> edgeToEdgeControllerSupplier,
|
||||
StartupMetricsTracker startupMetricsTracker) {
|
||||
@@ -208,7 +210,7 @@ public class BraveNewTabPage extends NewTabPage {
|
||||
actionDelegate,
|
||||
mTabStripHeightSupplier,
|
||||
edgeToEdgeControllerSupplier,
|
||||
/*moduleRegistry */ null);
|
||||
/* moduleRegistry= */ null);
|
||||
|
||||
mFeedSurfaceProvider = feedSurfaceCoordinator;
|
||||
}
|
||||
|
||||
@@ -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<MerchantTrustSignalsCoordinator>
|
||||
merchantTrustSignalsCoordinatorSupplier,
|
||||
OmniboxActionDelegate omniboxActionDelegate,
|
||||
OmniboxActionDelegateImpl omniboxActionDelegate,
|
||||
@Nullable BrowserStateBrowserControlsVisibilityDelegate
|
||||
browserControlsVisibilityDelegate,
|
||||
@Nullable BackPressManager backPressManager,
|
||||
|
||||
+2
-2
@@ -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<String> bringTabGroupToFrontCallback,
|
||||
BookmarkState bookmarkState,
|
||||
OmniboxActionDelegate omniboxActionDelegate,
|
||||
OmniboxActionDelegateImpl omniboxActionDelegate,
|
||||
ActivityLifecycleDispatcher lifecycleDispatcher,
|
||||
OmniboxSuggestionsDropdownEmbedder embedder,
|
||||
WindowAndroid windowAndroid,
|
||||
|
||||
@@ -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<MerchantTrustSignalsCoordinator> merchantTrustSignalsCoordinatorSupplier,
|
||||
OmniboxActionDelegate omniboxActionDelegate,
|
||||
OmniboxActionDelegateImpl omniboxActionDelegate,
|
||||
Supplier<EphemeralTabCoordinator> ephemeralTabCoordinatorSupplier,
|
||||
boolean initializeWithIncognitoColors,
|
||||
@Nullable BackPressManager backPressManager,
|
||||
|
||||
Reference in New Issue
Block a user