Android: Remove |areBrowserControlsFullyVisible| from helper class

This CL addresses a TODO left in TabBrowserControlsOffsetHelper.
The method is deleted, and call site uses the method of
ChromeFullscreenManager directly.

Bug: 966272
Change-Id: If1bf007e33da38444361d303fe8fa734749268ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1630081Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664521}

chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java

@@ -43,8 +43,7 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
  * The presenter that displays a single tab modal dialog.
  */
 public class TabModalPresenter
-        extends ModalDialogManager.Presenter implements TabBrowserControlsOffsetHelper.Observer,
-                                                        ChromeFullscreenManager.FullscreenListener {
+        extends ModalDialogManager.Presenter implements ChromeFullscreenManager.FullscreenListener {
     private static final int ENTER_EXIT_ANIMATION_DURATION_MS = 200;
 
     /** The activity displaying the dialogs. */
@@ -121,8 +120,7 @@ public class TabModalPresenter
     }
 
     public void destroy() {
-        if (mChromeFullscreenManager != null) mChromeFullscreenManager.removeListener(this);
-
+        mChromeFullscreenManager.removeListener(this);
     }
 
     // ModalDialogManager.Presenter implementation.
@@ -140,7 +138,7 @@ public class TabModalPresenter
 
         setBrowserControlsAccess(true);
         // Don't show the dialog container before browser controls are guaranteed fully visible.
-        if (getControlsOffsetHelper().areBrowserControlsFullyVisible()) {
+        if (mChromeFullscreenManager.areBrowserControlsFullyVisible()) {
             runEnterAnimation(mDialogView);
         } else {
             mRunEnterAnimationOnCallback = true;
@@ -168,25 +166,20 @@ public class TabModalPresenter
         mDialogView = null;
     }
 
-    // TabBrowserControlsOffsetHelper.Observer implementation.
-
-    @Override
-    public void onBrowserControlsFullyVisible(Tab tab) {
-        if (getDialogModel() == null) return;
-        assert mActiveTab == tab;
-        if (mRunEnterAnimationOnCallback) {
-            mRunEnterAnimationOnCallback = false;
-            runEnterAnimation(mDialogView);
-        }
-    }
-
     // ChromeFullscreenManager.FullscreenListener implementation.
 
     @Override
     public void onContentOffsetChanged(int offset) {}
 
     @Override
-    public void onControlsOffsetChanged(int topOffset, int bottomOffset, boolean needsAnimate) {}
+    public void onControlsOffsetChanged(int topOffset, int bottomOffset, boolean needsAnimate) {
+        if (getDialogModel() == null || !mRunEnterAnimationOnCallback
+                || !mChromeFullscreenManager.areBrowserControlsFullyVisible()) {
+            return;
+        }
+        mRunEnterAnimationOnCallback = false;
+        runEnterAnimation(mDialogView);
+    }
 
     @Override
     public void onToggleOverlayVideoMode(boolean enabled) {}
@@ -197,10 +190,6 @@ public class TabModalPresenter
         mShouldUpdateContainerLayoutParams = true;
     }
 
-    private TabBrowserControlsOffsetHelper getControlsOffsetHelper() {
-        return TabBrowserControlsOffsetHelper.from(mActiveTab);
-    }
-
     /**
      * Change view hierarchy for the dialog container to be either the front most or beneath the
      * toolbar.
@@ -296,7 +285,6 @@ public class TabModalPresenter
             assert mActiveTab
                     != null : "Tab modal dialogs should be shown on top of an active tab.";
 
-            getControlsOffsetHelper().addObserver(this);
             // Hide contextual search panel so that bottom toolbar will not be
             // obscured and back press is not overridden.
             ContextualSearchManager contextualSearchManager =
@@ -329,7 +317,6 @@ public class TabModalPresenter
 
             menuButton.setEnabled(false);
         } else {
-            getControlsOffsetHelper().removeObserver(this);
             // Show the action bar back if it was dismissed when the dialogs were showing.
             if (mDidClearTextControls) {
                 mDidClearTextControls = false;
@@ -357,7 +344,8 @@ public class TabModalPresenter
         if (isShowing) mActiveTab.exitFullscreenMode();
 
         // Also need to update browser control state after dismissal to refresh the constraints.
-        TabBrowserControlsOffsetHelper offsetHelper = getControlsOffsetHelper();
+        TabBrowserControlsOffsetHelper offsetHelper =
+                TabBrowserControlsOffsetHelper.from(mActiveTab);
         if (isShowing && mActiveTab.areRendererInputEventsIgnored()) {
             offsetHelper.showAndroidControls(true);
         } else {

chrome/android/java/src/org/chromium/chrome/browser/tab/TabBrowserControlsOffsetHelper.java

@@ -8,7 +8,6 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 
-import org.chromium.base.ObserverList;
 import org.chromium.base.UserData;
 import org.chromium.base.UserDataHost;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -29,18 +28,7 @@ public class TabBrowserControlsOffsetHelper implements VrModeObserver, UserData
      */
     private static final int MAX_CONTROLS_ANIMATION_DURATION_MS = 200;
 
-    /**
-     * An interface for notification about browser controls offset updates.
-     */
-    public interface Observer {
-        /**
-         * Called when the browser controls are fully visible on screen.
-         */
-        void onBrowserControlsFullyVisible(Tab tab);
-    }
-
     private final Tab mTab;
-    private final ObserverList<Observer> mObservers = new ObserverList<>();
     private final TabObserver mTabObserver;
 
     private int mPreviousTopControlsOffsetY;
@@ -99,30 +87,6 @@ public class TabBrowserControlsOffsetHelper implements VrModeObserver, UserData
         return mIsControlsOffsetOverridden;
     }
 
-    /**
-     * @return Whether the browser controls are fully visible on screen.
-     * TODO(jinsukkim): Have clients listen to ChromFullscreenManager directly
-     *         and remove this method.
-     */
-    public boolean areBrowserControlsFullyVisible() {
-        final FullscreenManager manager = FullscreenManager.from(mTab);
-        return Float.compare(0f, manager.getBrowserControlHiddenRatio()) == 0;
-    }
-
-    /**
-     * @param observer The observer to be added to get notifications from this class.
-     */
-    public void addObserver(Observer observer) {
-        mObservers.addObserver(observer);
-    }
-
-    /**
-     * @param observer The observer to be removed to cancel notifications from this class.
-     */
-    public void removeObserver(Observer observer) {
-        mObservers.removeObserver(observer);
-    }
-
     /**
      * Called when offset values related with fullscreen functionality has been changed by the
      * compositor.
@@ -216,11 +180,6 @@ public class TabBrowserControlsOffsetHelper implements VrModeObserver, UserData
         } else {
             manager.setPositionsForTab(topControlsOffset, bottomControlsOffset, topContentOffset);
         }
-
-        if (!areBrowserControlsFullyVisible()) return;
-        for (Observer observer : mObservers) {
-            observer.onBrowserControlsFullyVisible(mTab);
-        }
     }
 
     /**