[Android] Minor code adjustments to the C118 upstream changes

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkManagerMediator.java

@@ -18,6 +18,7 @@ import android.provider.OpenableColumns;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 import org.chromium.base.Log;
 import org.chromium.base.supplier.ObservableSupplierImpl;
@@ -40,6 +41,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.function.Consumer;
 
 class BraveBookmarkManagerMediator
         extends BookmarkManagerMediator implements BraveBookmarkDelegate {
@@ -61,12 +63,12 @@ class BraveBookmarkManagerMediator
             BookmarkUndoController bookmarkUndoController, ModelList modelList,
             BookmarkUiPrefs bookmarkUiPrefs, Runnable hideKeyboardRunnable,
             BookmarkImageFetcher bookmarkImageFetcher, ShoppingService shoppingService,
-            SnackbarManager snackbarManager) {
+            SnackbarManager snackbarManager, Consumer<OnScrollListener> onScrollListenerConsumer) {
         super(context, bookmarkModel, bookmarkOpener, selectableListLayout, selectionDelegate,
                 recyclerView, dragReorderableRecyclerViewAdapter, largeIconBridge, isDialogUi,
                 isIncognito, backPressStateSupplier, profile, bookmarkUndoController, modelList,
                 bookmarkUiPrefs, hideKeyboardRunnable, bookmarkImageFetcher, shoppingService,
-                snackbarManager);
+                snackbarManager, onScrollListenerConsumer);
     }
 
     public void setWindow(ActivityWindowAndroid window) {

android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkToolbarCoordinator.java

@@ -25,10 +25,12 @@ class BraveBookmarkToolbarCoordinator extends BookmarkToolbarCoordinator {
             DragReorderableRecyclerViewAdapter dragReorderableRecyclerViewAdapter,
             boolean isDialogUi, OneshotSupplier<BookmarkDelegate> bookmarkDelegateSupplier,
             BookmarkModel bookmarkModel, BookmarkOpener bookmarkOpener,
-            BookmarkUiPrefs bookmarkUiPrefs, ModalDialogManager modalDialogManager) {
+            BookmarkUiPrefs bookmarkUiPrefs, ModalDialogManager modalDialogManager,
+            Runnable endSearchRunnable) {
         super(context, selectableListLayout, selectionDelegate, searchDelegate,
                 dragReorderableRecyclerViewAdapter, isDialogUi, bookmarkDelegateSupplier,
-                bookmarkModel, bookmarkOpener, bookmarkUiPrefs, modalDialogManager);
+                bookmarkModel, bookmarkOpener, bookmarkUiPrefs, modalDialogManager,
+                endSearchRunnable);
 
         if (mToolbar instanceof BraveBookmarkToolbar) {
             ((BraveBookmarkToolbar) mToolbar).setBraveBookmarkDelegate(bookmarkDelegateSupplier);

android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java

@@ -1092,11 +1092,11 @@ public class BraveNewTabPageLayout
             FeedSurfaceScrollDelegate scrollDelegate, TouchEnabledDelegate touchEnabledDelegate,
             UiConfig uiConfig, ActivityLifecycleDispatcher lifecycleDispatcher, NewTabPageUma uma,
             boolean isIncognito, WindowAndroid windowAndroid, boolean isNtpAsHomeSurfaceEnabled,
-            boolean isSurfacePolishEnabled, boolean isSurfacePolishOmniboxSizeEnabled) {
+            boolean isSurfacePolishEnabled, boolean isSurfacePolishOmniboxColorEnabled) {
         super.initialize(manager, activity, tileGroupDelegate, searchProviderHasLogo,
                 searchProviderIsGoogle, scrollDelegate, touchEnabledDelegate, uiConfig,
                 lifecycleDispatcher, uma, isIncognito, windowAndroid, isNtpAsHomeSurfaceEnabled,
-                isSurfacePolishEnabled, isSurfacePolishOmniboxSizeEnabled);
+                isSurfacePolishEnabled, isSurfacePolishOmniboxColorEnabled);
 
         assert mMvTilesContainerLayout != null : "Something has changed in the upstream!";
 

android/java/org/chromium/chrome/browser/omnibox/suggestions/BraveAutocompleteMediator.java

@@ -57,14 +57,14 @@ class BraveAutocompleteMediator extends AutocompleteMediator implements BraveSug
     }
 
     @Override
-    public void onTextChanged(String textWithoutAutocomplete, String textWithAutocomplete) {
+    public void onTextChanged(String textWithoutAutocomplete) {
         if (ProfileManager.isInitialized()
                 && !UserPrefs.get(Profile.getLastUsedRegularProfile())
                             .getBoolean(AUTOCOMPLETE_ENABLED)) {
             return;
         }
 
-        super.onTextChanged(textWithoutAutocomplete, textWithAutocomplete);
+        super.onTextChanged(textWithoutAutocomplete);
     }
 
     @Override

android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java

@@ -18,13 +18,12 @@ class BraveTabSwitcherModeTTCoordinator extends TabSwitcherModeTTCoordinator {
     private MenuButtonCoordinator mBraveMenuButtonCoordinator;
 
     BraveTabSwitcherModeTTCoordinator(ViewStub tabSwitcherToolbarStub,
-            ViewStub tabSwitcherFullscreenToolbarStub, MenuButtonCoordinator menuButtonCoordinator,
-            boolean isGridTabSwitcherEnabled, boolean isTabToGtsAnimationEnabled,
-            BooleanSupplier isIncognitoModeEnabledSupplier,
+            MenuButtonCoordinator menuButtonCoordinator, boolean isGridTabSwitcherEnabled,
+            boolean isTabToGtsAnimationEnabled, BooleanSupplier isIncognitoModeEnabledSupplier,
             ToolbarColorObserverManager toolbarColorObserverManager) {
-        super(tabSwitcherToolbarStub, tabSwitcherFullscreenToolbarStub, menuButtonCoordinator,
-                isGridTabSwitcherEnabled, isTabToGtsAnimationEnabled,
-                isIncognitoModeEnabledSupplier, toolbarColorObserverManager);
+        super(tabSwitcherToolbarStub, menuButtonCoordinator, isGridTabSwitcherEnabled,
+                isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier,
+                toolbarColorObserverManager);
 
         mBraveMenuButtonCoordinator = menuButtonCoordinator;
     }

android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java

@@ -47,7 +47,7 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
     private ObservableSupplier<Integer> mConstraintsProxy;
 
     public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer,
-            ViewStub toolbarStub, ViewStub fullscreenToolbarStub, ToolbarLayout toolbarLayout,
+            ViewStub toolbarStub, ToolbarLayout toolbarLayout,
             ToolbarDataProvider toolbarDataProvider, ToolbarTabController tabController,
             UserEducationHelper userEducationHelper, List<ButtonDataProvider> buttonDataProviders,
             OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
@@ -61,9 +61,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             ButtonDataProvider identityDiscController, Callback<Runnable> invalidatorCallback,
             Supplier<ButtonData> identityDiscButtonSupplier,
             Supplier<ResourceManager> resourceManagerSupplier,
-            BooleanSupplier isIncognitoModeEnabledSupplier, boolean isGridTabSwitcherEnabled,
-            boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled,
-            boolean isTabGroupsAndroidContinuationEnabled, HistoryDelegate historyDelegate,
+            BooleanSupplier isIncognitoModeEnabledSupplier, boolean isTabToGtsAnimationEnabled,
+            boolean isStartSurfaceEnabled, HistoryDelegate historyDelegate,
             BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader,
             boolean initializeWithIncognitoColors,
             Callback<LoadUrlParams> startSurfaceLogoClickedCallback,
@@ -72,19 +71,18 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             BrowserStateBrowserControlsVisibilityDelegate
                     browserStateBrowserControlsVisibilityDelegate,
             boolean shouldCreateLogoInStartToolbar, FullscreenManager fullscreenManager) {
-        super(controlContainer, toolbarStub, fullscreenToolbarStub, toolbarLayout,
-                toolbarDataProvider, tabController, userEducationHelper, buttonDataProviders,
-                layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider,
+        super(controlContainer, toolbarStub, toolbarLayout, toolbarDataProvider, tabController,
+                userEducationHelper, buttonDataProviders, layoutStateProviderSupplier,
+                normalThemeColorProvider, overviewThemeColorProvider,
                 browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator,
                 appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier,
                 identityDiscController, invalidatorCallback, identityDiscButtonSupplier,
-                resourceManagerSupplier, isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled,
-                isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
-                isTabGroupsAndroidContinuationEnabled, historyDelegate,
-                partnerHomepageEnabledSupplier, offlineDownloader, initializeWithIncognitoColors,
-                startSurfaceLogoClickedCallback, isStartSurfaceRefactorEnabled, constraintsSupplier,
-                compositorInMotionSupplier, browserStateBrowserControlsVisibilityDelegate,
-                shouldCreateLogoInStartToolbar, fullscreenManager);
+                resourceManagerSupplier, isIncognitoModeEnabledSupplier, isTabToGtsAnimationEnabled,
+                isStartSurfaceEnabled, historyDelegate, partnerHomepageEnabledSupplier,
+                offlineDownloader, initializeWithIncognitoColors, startSurfaceLogoClickedCallback,
+                isStartSurfaceRefactorEnabled, constraintsSupplier, compositorInMotionSupplier,
+                browserStateBrowserControlsVisibilityDelegate, shouldCreateLogoInStartToolbar,
+                fullscreenManager);
 
         mBraveToolbarLayout = toolbarLayout;
         mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator;
@@ -94,9 +92,9 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             if (!isStartSurfaceEnabled) {
                 mTabSwitcherModeCoordinator = new BraveTabSwitcherModeTTCoordinator(
                         controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub),
-                        fullscreenToolbarStub, overviewModeMenuButtonCoordinator,
-                        isGridTabSwitcherEnabled, isTabToGtsAnimationEnabled,
-                        isIncognitoModeEnabledSupplier, mToolbarColorObserverManager);
+                        overviewModeMenuButtonCoordinator, isGridTabSwitcherEnabled,
+                        isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier,
+                        mToolbarColorObserverManager);
             }
         }
     }