[Android] Adjusted java code to new c-tor and function signatures

android/java/org/chromium/chrome/browser/compositor/layouts/BraveLayoutManagerChrome.java

@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import org.chromium.base.jank_tracker.JankTracker;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplierImpl;
 import org.chromium.base.supplier.Supplier;
@@ -40,9 +41,10 @@ public class BraveLayoutManagerChrome extends LayoutManagerChrome
             ObservableSupplier<TabContentManager> tabContentManagerSupplier,
             Supplier<LayerTitleCache> layerTitleCacheSupplier,
             OneshotSupplierImpl<OverviewModeBehavior> overviewModeBehaviorSupplier,
-            Supplier<TopUiThemeColorProvider> topUiThemeColorProvider) {
+            Supplier<TopUiThemeColorProvider> topUiThemeColorProvider, JankTracker jankTracker) {
         super(host, contentContainer, createOverviewLayout, startSurface, tabContentManagerSupplier,
-                layerTitleCacheSupplier, overviewModeBehaviorSupplier, topUiThemeColorProvider);
+                layerTitleCacheSupplier, overviewModeBehaviorSupplier, topUiThemeColorProvider,
+                jankTracker);
 
         mCreateOverviewLayout = createOverviewLayout && startSurface == null;
     }

android/java/org/chromium/chrome/browser/compositor/layouts/phone/StackLayout.java

@@ -187,9 +187,4 @@ public class StackLayout extends StackLayoutBase {
 
         super.setActiveStackState(stackIndex);
     }
-
-    @Override
-    public boolean shouldAllowIncognitoSwitching() {
-        return !mAnimatingStackSwitch;
-    }
 }

android/java/org/chromium/chrome/browser/compositor/layouts/phone/StackLayoutBase.java

@@ -1701,8 +1701,6 @@ public abstract class StackLayoutBase extends Layout {
         }
     }
 
-    @Override
-    @VisibleForTesting
     public boolean isLayoutAnimating() {
         for (int i = 0; i < mLayoutAnimations.size(); i++) {
             if (mLayoutAnimations.get(i).first.isRunning()) return true;

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

@@ -53,6 +53,7 @@ import org.chromium.base.Log;
 import org.chromium.base.MathUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.supplier.BooleanSupplier;
+import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveAdsNativeHelper;
@@ -1266,10 +1267,12 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
     @Override
     protected void initialize(ToolbarDataProvider toolbarDataProvider,
             ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator,
-            BooleanSupplier isInVrSupplier, HistoryDelegate historyDelegate,
-            BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader) {
-        super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator, isInVrSupplier,
-                historyDelegate, partnerHomepageEnabledSupplier, offlineDownloader);
+            ObservableSupplier<Boolean> isProgressBarVisibleSupplier,
+            HistoryDelegate historyDelegate, BooleanSupplier partnerHomepageEnabledSupplier,
+            OfflineDownloader offlineDownloader) {
+        super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator,
+                isProgressBarVisibleSupplier, historyDelegate, partnerHomepageEnabledSupplier,
+                offlineDownloader);
         BraveMenuButtonCoordinator.setMenuFromBottom(isMenuButtonOnBottom());
     }
 

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

@@ -53,7 +53,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
             ObservableSupplier<Boolean> homepageManagedByPolicySupplier,
             ObservableSupplier<Boolean> identityDiscStateSupplier,
             Callback<Runnable> invalidatorCallback, Supplier<ButtonData> identityDiscButtonSupplier,
-            Supplier<ResourceManager> resourceManagerSupplier, BooleanSupplier isInVrSupplier,
+            Supplier<ResourceManager> resourceManagerSupplier,
+            ObservableSupplier<Boolean> isProgressBarVisibleSupplier,
             BooleanSupplier isIncognitoModeEnabledSupplier, boolean isGridTabSwitcherEnabled,
             boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled,
             boolean isTabGroupsAndroidContinuationEnabled, HistoryDelegate historyDelegate,
@@ -65,8 +66,9 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator {
                 appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier,
                 startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier,
                 identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier,
-                resourceManagerSupplier, isInVrSupplier, isIncognitoModeEnabledSupplier,
-                isGridTabSwitcherEnabled, isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
+                resourceManagerSupplier, isProgressBarVisibleSupplier,
+                isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled,
+                isTabToGtsAnimationEnabled, isStartSurfaceEnabled,
                 isTabGroupsAndroidContinuationEnabled, historyDelegate,
                 partnerHomepageEnabledSupplier, offlineDownloader);