Skip to content

Commit 200209b

Browse files
samartnikcdesouza-chromium
authored andcommitted
[Android] C-tor signature change for TopToolbarCoordinator
Chromium change: https://chromium.googlesource.com/chromium/src/+/754d173c43ec2d98025a07946e5296828dc239cb [Reload Button] Add support to observe tab changes Observe tab changes in the ReloadButtonMediator instead of updating it from ToolbarManager. Reload state will change based on the current tab and its loading and crashed states. Reworked how reload button received updates from NTP. Previously any component could change reloading state by calling public API. Now we enforce NTP reloading state with ObservableSupplier and keeping reloading state management in a single place. Bug: 402347979
1 parent 679e3fe commit 200209b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.chromium.chrome.browser.toolbar.ToolbarTabController;
3636
import org.chromium.chrome.browser.toolbar.menu_button.MenuButton;
3737
import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
38-
import org.chromium.chrome.browser.toolbar.reload_button.ReloadButtonCoordinator;
3938
import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate;
4039
import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader;
4140
import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
@@ -90,7 +89,7 @@ public BraveTopToolbarCoordinator(
9089
OneshotSupplier<TabStripTransitionDelegate> tabStripTransitionDelegateSupplier,
9190
@Nullable OnLongClickListener onLongClickListener,
9291
ToolbarProgressBar progressBar,
93-
@Nullable ReloadButtonCoordinator reloadButtonCoordinator) {
92+
ObservableSupplier<Tab> tabSupplier) {
9493
super(
9594
controlContainer,
9695
toolbarLayout,
@@ -119,7 +118,7 @@ public BraveTopToolbarCoordinator(
119118
tabStripTransitionDelegateSupplier,
120119
onLongClickListener,
121120
progressBar,
122-
reloadButtonCoordinator);
121+
tabSupplier);
123122

124123
mBraveToolbarLayout = toolbarLayout;
125124
mBraveMenuButtonCoordinator = browsingModeMenuButtonCoordinator;

android/javatests/org/chromium/chrome/browser/BytecodeTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
import org.chromium.chrome.browser.toolbar.ToolbarProgressBar;
131131
import org.chromium.chrome.browser.toolbar.ToolbarTabController;
132132
import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator;
133-
import org.chromium.chrome.browser.toolbar.reload_button.ReloadButtonCoordinator;
134133
import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate;
135134
import org.chromium.chrome.browser.toolbar.top.ToggleTabStackButtonCoordinator;
136135
import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback;
@@ -1335,7 +1334,7 @@ public void testConstructorsExistAndMatch() throws Exception {
13351334
OneshotSupplier.class,
13361335
OnLongClickListener.class,
13371336
ToolbarProgressBar.class,
1338-
ReloadButtonCoordinator.class));
1337+
ObservableSupplier.class));
13391338
Assert.assertTrue(
13401339
constructorsMatch(
13411340
"org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator",

0 commit comments

Comments
 (0)