diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index 83bf03a4e31..aebd8d0853b 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -93,6 +93,7 @@ import org.chromium.chrome.browser.theme.ThemeUtils; import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarProgressBar; import org.chromium.chrome.browser.toolbar.ToolbarTabController; +import org.chromium.chrome.browser.toolbar.back_button.BackButtonCoordinator; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; import org.chromium.chrome.browser.toolbar.home_button.HomeButton; @@ -1503,7 +1504,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout UserEducationHelper userEducationHelper, ObservableSupplier trackerSupplier, ToolbarProgressBar progressBar, - @Nullable ReloadButtonCoordinator reloadButtonCoordinator) { + @Nullable ReloadButtonCoordinator reloadButtonCoordinator, + @Nullable BackButtonCoordinator backButtonCoordinator) { super.initialize( toolbarDataProvider, tabController, @@ -1515,7 +1517,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout userEducationHelper, trackerSupplier, progressBar, - reloadButtonCoordinator); + reloadButtonCoordinator, + backButtonCoordinator); BraveMenuButtonCoordinator.setMenuFromBottom( isMenuButtonOnBottomControls() 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 7ce08397992..171b8674c51 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -33,6 +33,7 @@ import org.chromium.chrome.browser.toolbar.ButtonDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarProgressBar; import org.chromium.chrome.browser.toolbar.ToolbarTabController; +import org.chromium.chrome.browser.toolbar.back_button.BackButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; @@ -89,7 +90,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { OneshotSupplier tabStripTransitionDelegateSupplier, @Nullable OnLongClickListener onLongClickListener, ToolbarProgressBar progressBar, - ObservableSupplier tabSupplier) { + ObservableSupplier tabSupplier, + @Nullable BackButtonCoordinator backButtonCoordinator) { super( controlContainer, toolbarLayout, @@ -118,7 +120,8 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { tabStripTransitionDelegateSupplier, onLongClickListener, progressBar, - tabSupplier); + tabSupplier, + backButtonCoordinator); mBraveToolbarLayout = toolbarLayout; mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator; diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 0ecf55fea14..7962f5642a2 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -128,6 +128,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarManager; import org.chromium.chrome.browser.toolbar.ToolbarProgressBar; import org.chromium.chrome.browser.toolbar.ToolbarTabController; +import org.chromium.chrome.browser.toolbar.back_button.BackButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.toolbar.top.ToggleTabStackButtonCoordinator; @@ -1333,7 +1334,8 @@ public class BytecodeTest { OneshotSupplier.class, OnLongClickListener.class, ToolbarProgressBar.class, - ObservableSupplier.class)); + ObservableSupplier.class, + BackButtonCoordinator.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",