Changed parameter at MultiInstanceManagerApi31.ctor
Related Chromium change: https://source.chromium.org/chromium/chromium/src/+/d294821b0548c2021e27ea625f9f4230d556ffbf [TSLO] Update MultiInstanceManagerApi31 to use DesktopWindowStateProvider This CL removes the boolean desktop window mode supplier used by MultiInstanceManager and injects a DesktopWindowStateProvider supplier instead, since the latter is instantiated after MultiInstanceManager on startup. Bug: 325351108 Change-Id: Ibe3c7cbb66cc0a31459d705e86ca69313d99b63a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5503037
This commit is contained in:
+4
-2
@@ -8,12 +8,14 @@ package org.chromium.chrome.browser.multiwindow;
|
||||
import android.app.Activity;
|
||||
|
||||
import org.chromium.base.supplier.ObservableSupplier;
|
||||
import org.chromium.base.supplier.Supplier;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator;
|
||||
import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
|
||||
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
|
||||
import org.chromium.chrome.browser.ui.desktop_windowing.DesktopWindowStateProvider;
|
||||
import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
|
||||
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
|
||||
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
|
||||
@@ -34,7 +36,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 {
|
||||
ActivityLifecycleDispatcher activityLifecycleDispatcher,
|
||||
ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier,
|
||||
MenuOrKeyboardActionController menuOrKeyboardActionController,
|
||||
ObservableSupplier<Boolean> desktopWindowModeSupplier) {
|
||||
Supplier<DesktopWindowStateProvider> desktopWindowStateProviderSupplier) {
|
||||
super(
|
||||
activity,
|
||||
tabModelOrchestratorSupplier,
|
||||
@@ -42,7 +44,7 @@ class BraveMultiInstanceManagerApi31 extends MultiInstanceManagerApi31 {
|
||||
activityLifecycleDispatcher,
|
||||
modalDialogManagerSupplier,
|
||||
menuOrKeyboardActionController,
|
||||
desktopWindowModeSupplier);
|
||||
desktopWindowStateProviderSupplier);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+4
-3
@@ -100,9 +100,10 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
|
||||
layoutStateProviderSupplier.onAvailable(
|
||||
mCallbackController.makeCancelable(this::setLayoutStateProvider));
|
||||
|
||||
final OnClickListener homeButtonListener = v -> {
|
||||
openHomepageAction.run();
|
||||
};
|
||||
final OnClickListener homeButtonListener =
|
||||
v -> {
|
||||
openHomepageAction.run();
|
||||
};
|
||||
|
||||
final OnClickListener searchAcceleratorListener =
|
||||
v -> {
|
||||
|
||||
@@ -1270,7 +1270,7 @@ public class BytecodeTest {
|
||||
ActivityLifecycleDispatcher.class,
|
||||
ObservableSupplier.class,
|
||||
MenuOrKeyboardActionController.class,
|
||||
ObservableSupplier.class));
|
||||
Supplier.class));
|
||||
Assert.assertTrue(
|
||||
constructorsMatch(
|
||||
"org/chromium/chrome/browser/multiwindow/MultiWindowUtils",
|
||||
|
||||
Reference in New Issue
Block a user