diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 369b4c38160..c5783554b64 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -161,7 +161,8 @@ public class BraveToolbarManager extends ToolbarManager { OneshotSupplier tabReparentingControllerSupplier, @NonNull OmniboxPedalDelegate omniboxPedalDelegate, Supplier ephemeralTabCoordinatorSupplier, - boolean initializeWithIncognitoColors, @Nullable BackPressManager backPressManager) { + boolean initializeWithIncognitoColors, @Nullable BackPressManager backPressManager, + @Nullable Runnable unblockDrawForOverviewPageRunnable) { super(activity, controlsSizer, fullscreenManager, controlContainer, compositorViewHolder, urlFocusChangedCallback, topUiThemeColorProvider, tabObscuringHandler, shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider, @@ -175,7 +176,8 @@ public class BraveToolbarManager extends ToolbarManager { bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager, snackbarManager, jankTracker, merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier, omniboxPedalDelegate, - ephemeralTabCoordinatorSupplier, initializeWithIncognitoColors, backPressManager); + ephemeralTabCoordinatorSupplier, initializeWithIncognitoColors, backPressManager, + unblockDrawForOverviewPageRunnable); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index b57840fe1d5..4c863654581 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -55,8 +55,6 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { ObservableSupplier appMenuButtonHelperSupplier, ObservableSupplier tabModelSelectorSupplier, ObservableSupplier homepageEnabledSupplier, - ObservableSupplier startSurfaceAsHomepageSupplier, - ObservableSupplier homepageManagedByPolicySupplier, ObservableSupplier identityDiscStateSupplier, Callback invalidatorCallback, Supplier identityDiscButtonSupplier, Supplier resourceManagerSupplier, @@ -73,7 +71,6 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider, browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator, appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier, - startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier, identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier, resourceManagerSupplier, isProgressBarVisibleSupplier, isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled, isTabletGtsPolishEnabled, diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java index 64d274d5b7f..cf4d5932414 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java @@ -19,7 +19,6 @@ import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.suggestions.BraveDropdownItemViewInfoListManager; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; import org.chromium.chrome.browser.omnibox.suggestions.brave_search.BraveSearchBannerProcessor; -import org.chromium.chrome.browser.omnibox.suggestions.mostvisited.ExploreIconProvider; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.ProfileManager; import org.chromium.chrome.browser.share.ShareDelegate; @@ -46,12 +45,11 @@ class BraveAutocompleteMediator extends AutocompleteMediator implements BraveSug @NonNull Callback bringTabToFrontCallback, @NonNull Supplier tabWindowManagerSupplier, @NonNull BookmarkState bookmarkState, @NonNull JankTracker jankTracker, - @NonNull ExploreIconProvider exploreIconProvider, @NonNull OmniboxPedalDelegate omniboxPedalDelegate) { super(context, delegate, textProvider, listPropertyModel, handler, modalDialogManagerSupplier, activityTabSupplier, shareDelegateSupplier, locationBarDataProvider, bringTabToFrontCallback, tabWindowManagerSupplier, - bookmarkState, jankTracker, exploreIconProvider, omniboxPedalDelegate); + bookmarkState, jankTracker, omniboxPedalDelegate); } @Override diff --git a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java index dde23b13c50..343414f2a18 100644 --- a/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java +++ b/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor.java @@ -10,6 +10,7 @@ package org.chromium.chrome.browser.omnibox.suggestions.editurl; import android.content.Context; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.omnibox.suggestions.FaviconFetcher; import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost; import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate; import org.chromium.chrome.browser.share.ShareDelegate; @@ -21,9 +22,9 @@ public class BraveEditUrlSuggestionProcessor extends EditUrlSuggestionProcessor private boolean mHasClearedOmniboxForFocus; public BraveEditUrlSuggestionProcessor(Context context, SuggestionHost suggestionHost, - UrlBarDelegate locationBarDelegate, Supplier iconBridgeSupplier, + UrlBarDelegate locationBarDelegate, FaviconFetcher faviconFetcher, Supplier tabSupplier, Supplier shareDelegateSupplier) { - super(context, suggestionHost, locationBarDelegate, iconBridgeSupplier, tabSupplier, + super(context, suggestionHost, locationBarDelegate, faviconFetcher, tabSupplier, shareDelegateSupplier); }