Commit cca2bfcf authored by bttk's avatar bttk Committed by Commit Bot

[ToolbarMVC] Move setOverviewModeBehavior to LocationBar

Bug: 1133482
Change-Id: I9745a5d58c3a933e3c59059976f1c47fe210886c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2439430
Commit-Queue: who/bttk <bttk@chromium.org>
Reviewed-by: default avatarPatrick Noland <pnoland@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813026}
parent 440522e7
...@@ -49,6 +49,7 @@ import org.chromium.chrome.R; ...@@ -49,6 +49,7 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.WindowDelegate; import org.chromium.chrome.browser.WindowDelegate;
import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.native_page.NativePageFactory; import org.chromium.chrome.browser.native_page.NativePageFactory;
import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
...@@ -829,6 +830,9 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL ...@@ -829,6 +830,9 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
@Override @Override
public void setUnfocusedWidth(int unfocusedWidth) {} public void setUnfocusedWidth(int unfocusedWidth) {}
@Override
public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) {}
// Implements FakeBoxDelegate. // Implements FakeBoxDelegate.
@Override @Override
public boolean isUrlBarFocused() { public boolean isUrlBarFocused() {
......
...@@ -15,6 +15,7 @@ import org.chromium.base.supplier.ObservableSupplier; ...@@ -15,6 +15,7 @@ import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.Supplier; import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.WindowDelegate; import org.chromium.chrome.browser.WindowDelegate;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.ntp.FakeboxDelegate; import org.chromium.chrome.browser.ntp.FakeboxDelegate;
import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate; import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate;
...@@ -128,6 +129,11 @@ public interface LocationBar extends UrlBarDelegate, FakeboxDelegate { ...@@ -128,6 +129,11 @@ public interface LocationBar extends UrlBarDelegate, FakeboxDelegate {
*/ */
void setToolbarDataProvider(ToolbarDataProvider model); void setToolbarDataProvider(ToolbarDataProvider model);
/**
* Sets the {@link OverviewModeBehavior}.
*/
void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior);
/** /**
* Gets the {@link ToolbarDataProvider} to be used for accessing {@link Toolbar} state. * Gets the {@link ToolbarDataProvider} to be used for accessing {@link Toolbar} state.
*/ */
......
...@@ -43,6 +43,7 @@ import org.chromium.chrome.R; ...@@ -43,6 +43,7 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.AppHooks;
import org.chromium.chrome.browser.WindowDelegate; import org.chromium.chrome.browser.WindowDelegate;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.gsa.GSAState; import org.chromium.chrome.browser.gsa.GSAState;
import org.chromium.chrome.browser.locale.LocaleManager; import org.chromium.chrome.browser.locale.LocaleManager;
...@@ -355,6 +356,11 @@ public class LocationBarLayout extends FrameLayout ...@@ -355,6 +356,11 @@ public class LocationBarLayout extends FrameLayout
return mAutocompleteCoordinator; return mAutocompleteCoordinator;
} }
@Override
public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) {
mAutocompleteCoordinator.setOverviewModeBehavior(overviewModeBehavior);
}
@Override @Override
public void onDeferredStartup() { public void onDeferredStartup() {
mAutocompleteCoordinator.prefetchZeroSuggestResults(); mAutocompleteCoordinator.prefetchZeroSuggestResults();
......
...@@ -15,7 +15,6 @@ import android.view.View; ...@@ -15,7 +15,6 @@ import android.view.View;
import org.chromium.base.TraceEvent; import org.chromium.base.TraceEvent;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.ntp.NewTabPage; import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.ui.interpolators.BakedBezierInterpolator; import org.chromium.ui.interpolators.BakedBezierInterpolator;
...@@ -329,10 +328,6 @@ public class LocationBarPhone extends LocationBarLayout { ...@@ -329,10 +328,6 @@ public class LocationBarPhone extends LocationBarLayout {
} }
} }
public void setOverviewModeBehavior(OverviewModeBehavior overviewModeBehavior) {
mAutocompleteCoordinator.setOverviewModeBehavior(overviewModeBehavior);
}
/** Update the status visibility according to the current state held in LocationBar. */ /** Update the status visibility according to the current state held in LocationBar. */
private void updateStatusVisibility() { private void updateStatusVisibility() {
boolean incognito = getToolbarDataProvider().isIncognito(); boolean incognito = getToolbarDataProvider().isIncognito();
......
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