Commit 2aeda832 authored by gogerald's avatar gogerald Committed by Commit Bot

[ToolBar] Remove unused parameters and interfaces

Bug: 1035573
Change-Id: I12f217b6cb01481f3f414f81bcb6c41f14738c9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1974832Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Auto-Submit: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728246}
parent e8e90d57
...@@ -1002,9 +1002,9 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF ...@@ -1002,9 +1002,9 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF
(id) -> mActivity.onOptionsItemSelected(id, null)); (id) -> mActivity.onOptionsItemSelected(id, null));
} }
mToolbar.initializeWithNative(tabModelSelector, controlsVisibilityDelegate, layoutManager, mToolbar.initializeWithNative(tabModelSelector, layoutManager, tabSwitcherClickHandler,
tabSwitcherClickHandler, tabSwitcherLongClickHandler, newTabClickHandler, tabSwitcherLongClickHandler, newTabClickHandler, bookmarkClickHandler,
bookmarkClickHandler, customTabsBackClickHandler, overviewModeBehavior); customTabsBackClickHandler, overviewModeBehavior);
mToolbar.addOnAttachStateChangeListener(new OnAttachStateChangeListener() { mToolbar.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
@Override @Override
......
...@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.compositor.Invalidator; ...@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.compositor.Invalidator;
import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost; import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.findinpage.FindToolbar; import org.chromium.chrome.browser.findinpage.FindToolbar;
import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.omnibox.LocationBar; import org.chromium.chrome.browser.omnibox.LocationBar;
import org.chromium.chrome.browser.omnibox.UrlBarData; import org.chromium.chrome.browser.omnibox.UrlBarData;
...@@ -459,12 +458,6 @@ public abstract class ToolbarLayout ...@@ -459,12 +458,6 @@ public abstract class ToolbarLayout
mFindInPageToolbarShowing = showing; mFindInPageToolbarShowing = showing;
} }
/**
* Sets the delegate to handle visibility of browser controls.
*/
void setBrowserControlsVisibilityDelegate(
BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate) {}
/** /**
* Sets the OnClickListener that will be notified when the TabSwitcher button is pressed. * Sets the OnClickListener that will be notified when the TabSwitcher button is pressed.
* @param listener The callback that will be notified when the TabSwitcher button is pressed. * @param listener The callback that will be notified when the TabSwitcher button is pressed.
......
...@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.compositor.Invalidator; ...@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.compositor.Invalidator;
import org.chromium.chrome.browser.compositor.layouts.LayoutManager; import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.findinpage.FindToolbar; import org.chromium.chrome.browser.findinpage.FindToolbar;
import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;
import org.chromium.chrome.browser.omnibox.LocationBar; import org.chromium.chrome.browser.omnibox.LocationBar;
import org.chromium.chrome.browser.partnercustomizations.HomepageManager; import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelector;
...@@ -109,7 +108,6 @@ public class TopToolbarCoordinator implements Toolbar { ...@@ -109,7 +108,6 @@ public class TopToolbarCoordinator implements Toolbar {
* Calling this must occur after the native library have completely loaded. * Calling this must occur after the native library have completely loaded.
* *
* @param tabModelSelector The selector that handles tab management. * @param tabModelSelector The selector that handles tab management.
* @param controlsVisibilityDelegate The delegate to handle visibility of browser controls.
* @param layoutManager A {@link LayoutManager} instance used to watch for scene changes. * @param layoutManager A {@link LayoutManager} instance used to watch for scene changes.
* @param tabSwitcherClickHandler The click handler for the tab switcher button. * @param tabSwitcherClickHandler The click handler for the tab switcher button.
* @param tabSwitcherLongClickHandler The long click handler for the tab switcher button. * @param tabSwitcherLongClickHandler The long click handler for the tab switcher button.
...@@ -120,7 +118,6 @@ public class TopToolbarCoordinator implements Toolbar { ...@@ -120,7 +118,6 @@ public class TopToolbarCoordinator implements Toolbar {
* changes. * changes.
*/ */
public void initializeWithNative(TabModelSelector tabModelSelector, public void initializeWithNative(TabModelSelector tabModelSelector,
BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate,
LayoutManager layoutManager, OnClickListener tabSwitcherClickHandler, LayoutManager layoutManager, OnClickListener tabSwitcherClickHandler,
OnLongClickListener tabSwitcherLongClickHandler, OnClickListener newTabClickHandler, OnLongClickListener tabSwitcherLongClickHandler, OnClickListener newTabClickHandler,
OnClickListener bookmarkClickHandler, OnClickListener customTabsBackClickHandler, OnClickListener bookmarkClickHandler, OnClickListener customTabsBackClickHandler,
...@@ -134,7 +131,6 @@ public class TopToolbarCoordinator implements Toolbar { ...@@ -134,7 +131,6 @@ public class TopToolbarCoordinator implements Toolbar {
mToolbarLayout.setTabModelSelector(tabModelSelector); mToolbarLayout.setTabModelSelector(tabModelSelector);
getLocationBar().updateVisualsForState(); getLocationBar().updateVisualsForState();
getLocationBar().setUrlToPageUrl(); getLocationBar().setUrlToPageUrl();
mToolbarLayout.setBrowserControlsVisibilityDelegate(controlsVisibilityDelegate);
mToolbarLayout.setOnTabSwitcherClickHandler(tabSwitcherClickHandler); mToolbarLayout.setOnTabSwitcherClickHandler(tabSwitcherClickHandler);
mToolbarLayout.setOnTabSwitcherLongClickHandler(tabSwitcherLongClickHandler); mToolbarLayout.setOnTabSwitcherLongClickHandler(tabSwitcherLongClickHandler);
mToolbarLayout.setBookmarkClickHandler(bookmarkClickHandler); mToolbarLayout.setBookmarkClickHandler(bookmarkClickHandler);
......
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