Remove SceneOverlay#onHideLayout

The only user of the onHideLayout signal was the OverlayPanel which has
an alternate signal through SceneChangeObserver (which it now uses).
The SceneOverlay method has been removed.

Bug: 1100332, 882508
Change-Id: If2b476eb567451db5803bb0922f9ea2e3a0244ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2320076
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Mei Liang <meiliang@chromium.org>
Reviewed-by: Donn Denman <donnd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792388}

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java

@@ -20,7 +20,9 @@ import org.chromium.base.ApplicationStatus.ActivityStateListener;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.compositor.LayerTitleCache;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
-import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.Layout;
+import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
+import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
@@ -108,6 +110,12 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
         int MAX_VALUE = 21;
     }
 
+    /** A layout manager for tracking changes in the active layout. */
+    private final LayoutManager mLayoutManager;
+
+    /** The observer that reacts to scene-change events. */
+    private final SceneChangeObserver mSceneChangeObserver;
+
     /** The activity this panel is in. */
     protected ChromeActivity mActivity;
 
@@ -154,17 +162,30 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
 
     /**
      * @param context The current Android {@link Context}.
-     * @param updateHost The {@link LayoutUpdateHost} used to request updates in the Layout.
+     * @param layoutManager A {@link LayoutManager} for observing changes in the active layout.
      * @param panelManager The {@link OverlayPanelManager} responsible for showing panels.
      */
     public OverlayPanel(
-            Context context, LayoutUpdateHost updateHost, OverlayPanelManager panelManager) {
-        super(context, updateHost);
+            Context context, LayoutManager layoutManager, OverlayPanelManager panelManager) {
+        super(context, layoutManager);
+        mLayoutManager = layoutManager;
         mContentFactory = this;
 
         mPanelManager = panelManager;
         mPanelManager.registerPanel(this);
         mEventFilter = new OverlayPanelEventFilter(mContext, this);
+
+        mSceneChangeObserver = new SceneChangeObserver() {
+            @Override
+            public void onTabSelectionHinted(int tabId) {}
+
+            @Override
+            public void onSceneChange(Layout layout) {
+                closePanel(StateChangeReason.UNKNOWN, false);
+            }
+        };
+        // mLayoutManager will be null in testing.
+        if (mLayoutManager != null) mLayoutManager.addSceneChangeObserver(mSceneChangeObserver);
     }
 
     /**
@@ -172,6 +193,7 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
      */
     public void destroy() {
         closePanel(StateChangeReason.UNKNOWN, false);
+        if (mLayoutManager != null) mLayoutManager.removeSceneChangeObserver(mSceneChangeObserver);
         ApplicationStatus.unregisterActivityStateListener(this);
     }
 
@@ -933,12 +955,6 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
         return true;
     }
 
-    @Override
-    public void onHideLayout() {
-        if (!isShowing()) return;
-        closePanel(StateChangeReason.UNKNOWN, false);
-    }
-
     @Override
     public boolean onBackPressed() {
         if (!isShowing()) return false;

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java

@@ -19,7 +19,7 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelContent;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPromoControl.ContextualSearchPromoHost;
-import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.compositor.scene_layer.ContextualSearchSceneLayer;
 import org.chromium.chrome.browser.compositor.scene_layer.SceneOverlayLayer;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
@@ -77,12 +77,12 @@ public class ContextualSearchPanel extends OverlayPanel {
 
     /**
      * @param context The current Android {@link Context}.
-     * @param updateHost The {@link LayoutUpdateHost} used to request updates in the Layout.
+     * @param layoutManager A layout manager for observing scene changes.
      * @param panelManager The object managing the how different panels are shown.
      */
     public ContextualSearchPanel(
-            Context context, LayoutUpdateHost updateHost, OverlayPanelManager panelManager) {
-        super(context, updateHost, panelManager);
+            Context context, LayoutManager layoutManager, OverlayPanelManager panelManager) {
+        super(context, layoutManager, panelManager);
         mSceneLayer = createNewContextualSearchSceneLayer();
         mPanelMetrics = new ContextualSearchPanelMetrics();
 

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/Layout.java

@@ -456,9 +456,6 @@ public abstract class Layout implements TabContentManager.ThumbnailChangeListene
         mUpdateHost.startHiding(nextTabId, hintAtTabSelection);
         mIsHiding = true;
         mNextTabId = nextTabId;
-        for (int i = 0; i < mSceneOverlays.size(); i++) {
-            mSceneOverlays.get(i).onHideLayout();
-        }
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/SceneOverlay.java

@@ -77,11 +77,6 @@ public interface SceneOverlay {
      */
     boolean onBackPressed();
 
-    /**
-     * A notification to the overlay that the containing layout is being hidden.
-     */
-    void onHideLayout();
-
     /**
      * @return True if this overlay handles tab creation.
      */

chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java

@@ -450,9 +450,6 @@ public class StripLayoutHelperManager implements SceneOverlay {
         return false;
     }
 
-    @Override
-    public void onHideLayout() {}
-
     @Override
     public boolean handlesTabCreating() {
         return false;

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ScrollingBottomViewSceneLayer.java

@@ -155,9 +155,6 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements
     public void onSizeChanged(
             float width, float height, float visibleViewportOffsetY, int orientation) {}
 
-    @Override
-    public void onHideLayout() {}
-
     @Override
     public void getVirtualViews(List<VirtualView> views) {}
 

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java

@@ -210,9 +210,6 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
         return false;
     }
 
-    @Override
-    public void onHideLayout() {}
-
     @Override
     public boolean handlesTabCreating() {
         return false;

chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java

@@ -124,9 +124,6 @@ class StatusIndicatorSceneLayer extends SceneOverlayLayer implements SceneOverla
     @Override
     public void getVirtualViews(List<VirtualView> views) {}
 
-    @Override
-    public void onHideLayout() {}
-
     @Override
     public void tabTitleChanged(int tabId, String title) {}
 

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManagerTest.java

@@ -23,7 +23,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.OverlayPanelManagerObserver;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager.PanelPriority;
-import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 
@@ -50,7 +50,7 @@ public class OverlayPanelManagerTest {
         private ViewGroup mContainerView;
         private DynamicResourceLoader mResourceLoader;
 
-        public MockOverlayPanel(Context context, LayoutUpdateHost updateHost,
+        public MockOverlayPanel(Context context, LayoutManager updateHost,
                 OverlayPanelManager panelManager, @PanelPriority int priority,
                 boolean canBeSuppressed) {
             super(context, updateHost, panelManager);

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTapEventTest.java

@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManagerWrapper;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
-import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
+import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeActivityTestRule;
@@ -68,6 +68,7 @@ public class ContextualSearchTapEventTest {
     private ContextualSearchPanel mPanel;
     private OverlayPanelManagerWrapper mPanelManager;
     private SelectionClient mContextualSearchClient;
+    private LayoutManager mLayoutManager;
 
     // --------------------------------------------------------------------------------------------
 
@@ -76,8 +77,8 @@ public class ContextualSearchTapEventTest {
      */
     private static class ContextualSearchPanelWrapper extends ContextualSearchPanel {
         public ContextualSearchPanelWrapper(
-                Context context, LayoutUpdateHost updateHost, OverlayPanelManager panelManager) {
-            super(context, updateHost, panelManager);
+                Context context, LayoutManager layoutManager, OverlayPanelManager panelManager) {
+            super(context, layoutManager, panelManager);
         }
 
         @Override