chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java - Issue 2484293003: Use only renderer driven offsets for fullscreen state.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Issue 2484293003: Use only renderer driven offsets for fullscreen state. (Closed)

Patch Set: Partially disable testControlsShownOnUnresponsiveRenderer due to timing issues with renderer logic … Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

index e5ce860011328606a9401fa9febffc30d8ce9aa4..10406f8bbac7bc2c9d67da3bf40bb3395f59f9b0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -40,7 +40,7 @@ import org.chromium.chrome.browser.compositor.layouts.LayoutManager;

import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;

import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.OverviewModeObserver;

import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;

-import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

+import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibilityDelegate;

import org.chromium.chrome.browser.fullscreen.FullscreenManager;

import org.chromium.chrome.browser.ntp.IncognitoNewTabPage;

import org.chromium.chrome.browser.ntp.NativePageFactory;

@@ -136,7 +136,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

private final ActionModeController mActionModeController;

private final LoadProgressSimulator mLoadProgressSimulator;

- private ChromeFullscreenManager mFullscreenManager;

+ private BrowserStateBrowserControlsVisibilityDelegate mControlsVisibilityDelegate;

private int mFullscreenFocusToken = FullscreenManager.INVALID_TOKEN;

private int mFullscreenFindInPageToken = FullscreenManager.INVALID_TOKEN;

private int mFullscreenMenuToken = FullscreenManager.INVALID_TOKEN;

@@ -492,9 +492,9 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

@Override

public void onFindToolbarShown() {

mToolbar.handleFindToolbarStateChange(true);

- if (mFullscreenManager != null) {

- mFullscreenFindInPageToken =

- mFullscreenManager.showControlsPersistentAndClearOldToken(

+ if (mControlsVisibilityDelegate != null) {

+ mFullscreenFindInPageToken = mControlsVisibilityDelegate

+ .showControlsPersistentAndClearOldToken(

mFullscreenFindInPageToken);

}

@@ -502,8 +502,9 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

@Override

public void onFindToolbarHidden() {

mToolbar.handleFindToolbarStateChange(false);

- if (mFullscreenManager != null) {

- mFullscreenManager.hideControlsPersistent(mFullscreenFindInPageToken);

+ if (mControlsVisibilityDelegate != null) {

+ mControlsVisibilityDelegate.hideControlsPersistent(

+ mFullscreenFindInPageToken);

mFullscreenFindInPageToken = FullscreenManager.INVALID_TOKEN;

}

@@ -576,14 +577,15 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

* <p>

* Calling this must occur after the native library have completely loaded.

- * @param tabModelSelector The selector that handles tab management.

- * @param fullscreenManager The manager in charge of interacting with the fullscreen feature.

- * @param findToolbarManager The manager for find in page.

- * @param overviewModeBehavior The overview mode manager.

- * @param layoutDriver A {@link LayoutManager} instance used to watch for scene changes.

+ * @param tabModelSelector The selector that handles tab management.

+ * @param controlsVisibilityDelegate The delegate to handle visibility of browser controls.

+ * @param findToolbarManager The manager for find in page.

+ * @param overviewModeBehavior The overview mode manager.

+ * @param layoutDriver A {@link LayoutManager} instance used to watch for scene

+ * changes.

public void initializeWithNative(TabModelSelector tabModelSelector,

- ChromeFullscreenManager fullscreenManager,

+ BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate,

final FindToolbarManager findToolbarManager,

final OverviewModeBehavior overviewModeBehavior,

final LayoutManager layoutDriver,

@@ -596,7 +598,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

mToolbar.getLocationBar().updateVisualsForState();

mToolbar.getLocationBar().setUrlToPageUrl();

- mToolbar.setFullscreenManager(fullscreenManager);

+ mToolbar.setBrowserControlsVisibilityDelegate(controlsVisibilityDelegate);

mToolbar.setOnTabSwitcherClickHandler(tabSwitcherClickHandler);

mToolbar.setOnNewTabClickHandler(newTabClickHandler);

mToolbar.setBookmarkClickHandler(bookmarkClickHandler);

@@ -649,8 +651,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

mFindToolbarManager = findToolbarManager;

- assert fullscreenManager != null;

- mFullscreenManager = fullscreenManager;

+ assert controlsVisibilityDelegate != null;

+ mControlsVisibilityDelegate = controlsVisibilityDelegate;

mNativeLibraryReady = false;

@@ -806,13 +808,13 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

menuHandler.addObserver(new AppMenuObserver() {

@Override

public void onMenuVisibilityChanged(boolean isVisible) {

- if (mFullscreenManager == null) return;

+ if (mControlsVisibilityDelegate == null) return;

if (isVisible) {

mFullscreenMenuToken =

- mFullscreenManager.showControlsPersistentAndClearOldToken(

+ mControlsVisibilityDelegate.showControlsPersistentAndClearOldToken(

mFullscreenMenuToken);

} else {

- mFullscreenManager.hideControlsPersistent(mFullscreenMenuToken);

+ mControlsVisibilityDelegate.hideControlsPersistent(mFullscreenMenuToken);

mFullscreenMenuToken = FullscreenManager.INVALID_TOKEN;

}

@@ -896,12 +898,12 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

if (mFindToolbarManager != null && hasFocus) mFindToolbarManager.hideToolbar();

- if (mFullscreenManager == null) return;

+ if (mControlsVisibilityDelegate == null) return;

if (hasFocus) {

- mFullscreenFocusToken = mFullscreenManager.showControlsPersistentAndClearOldToken(

- mFullscreenFocusToken);

+ mFullscreenFocusToken = mControlsVisibilityDelegate

+ .showControlsPersistentAndClearOldToken(mFullscreenFocusToken);

} else {

- mFullscreenManager.hideControlsPersistent(mFullscreenFocusToken);

+ mControlsVisibilityDelegate.hideControlsPersistent(mFullscreenFocusToken);

mFullscreenFocusToken = FullscreenManager.INVALID_TOKEN;

}