Commit 57abb538 authored by bttk's avatar bttk Committed by Commit Bot

[Crash fix] Create mActionModeControllerCallback in the constructor

This field was being set in initializeToolbar() and used in
initFindToolbarManager(). onInflationComplete() calls these methods
in a reverse order.

Bug: 1116924
Change-Id: I1899db0c9b572f3386cfe3ac480111b673c1c28c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2360573
Commit-Queue: who/bttk <bttk@chromium.org>
Reviewed-by: default avatarTomasz Wiszkowski <ender@google.com>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798891}
parent 4e2773bd
......@@ -138,7 +138,7 @@ public class RootUiCoordinator
private List<ButtonDataProvider> mButtonDataProviders;
private IdentityDiscController mIdentityDiscController;
private ChromeActionModeHandler mChromeActionModeHandler;
private ToolbarActionModeCallback mActionModeControllerCallback;
private final ToolbarActionModeCallback mActionModeControllerCallback;
private ObservableSupplierImpl<Boolean> mOmniboxFocusStateSupplier =
new ObservableSupplierImpl<>();
protected final ObservableSupplier<Profile> mProfileSupplier;
......@@ -191,6 +191,7 @@ public class RootUiCoordinator
mBookmarkBridgeSupplier = bookmarkBridgeSupplier;
mAppMenuSupplier = new ObservableSupplierImpl<>();
mContextualSearchManagerSupplier = contextualSearchManagerSupplier;
mActionModeControllerCallback = new ToolbarActionModeCallback();
mOmniboxFocusStateSupplier.set(false);
......@@ -509,7 +510,6 @@ public class RootUiCoordinator
bottomToolbarVisibilitySupplier, mActivity.getLifecycleDispatcher(),
mActivity.getModalDialogManager());
mButtonDataProviders = Arrays.asList(mIdentityDiscController, shareButtonController);
mActionModeControllerCallback = new ToolbarActionModeCallback();
mToolbarManager = new ToolbarManager(mActivity, mActivity.getBrowserControlsManager(),
mActivity.getFullscreenManager(), toolbarContainer,
mActivity.getCompositorViewHolder().getInvalidator(), urlFocusChangedCallback,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment