Avoid exposing StartSurface.OverviewModeObserver in StartSurfaceLayout

This is a follow up for crrev.com/c/2483031. StartSurfaceLayout
implements StartSurface.OverviewModeObserver#finishedShowing and
overrides Layout#doneShowing. These two methods have similar names, and
doneShowing() depends on finishedShowing(). It is hard to reason about
without a dive in investigation.

This CL avoids the confusion between these two methods by modifying
StartSurfaceLayout to stop implementing
StartSurface.OverviewModeObserver. Instead, StartSurfaceLayout
instantiates a StartSurface.OverviewModeObserver member and attaches
that member instance to StartSurfaceController directly.

Change-Id: I5904513b5fcd72fef3b571ecb513c334bd4a2d06
Bug: 1108496
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503392
Commit-Queue: Mei Liang <meiliang@chromium.org>
Auto-Submit: Mei Liang <meiliang@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823852}

chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java

@@ -52,7 +52,7 @@ import java.util.Locale;
 /**
  * A {@link Layout} that shows all tabs in one grid or carousel view.
  */
-public class StartSurfaceLayout extends Layout implements StartSurface.OverviewModeObserver {
+public class StartSurfaceLayout extends Layout {
     private static final String TAG = "SSLayout";
 
     // Duration of the transition animation
@@ -66,6 +66,7 @@ public class StartSurfaceLayout extends Layout implements StartSurface.OverviewM
     private TabListSceneLayer mSceneLayer;
     private final StartSurface mStartSurface;
     private final StartSurface.Controller mController;
+    private final StartSurface.OverviewModeObserver mStartSurfaceObserver;
     private final TabSwitcher.TabListDelegate mTabListDelegate;
     // To force Toolbar finishes its animation when this Layout finished hiding.
     private final LayoutTab mDummyLayoutTab;
@@ -97,25 +98,8 @@ public class StartSurfaceLayout extends Layout implements StartSurface.OverviewM
         mStartSurface = startSurface;
         mStartSurface.setOnTabSelectingListener(this::onTabSelecting);
         mController = mStartSurface.getController();
-        mController.addOverviewModeObserver(this);
-        mTabListDelegate = mStartSurface.getTabListDelegate();
-        if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) {
-            mThumbnailAspectRatio = (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue();
-            mThumbnailAspectRatio = MathUtils.clamp(mThumbnailAspectRatio, 0.5f, 2.0f);
-        }
-    }
 
-    @Override
-    public void onFinishNativeInitialization() {
-        if (mIsInitialized) return;
-
-        mIsInitialized = true;
-        mStartSurface.initWithNative();
-        ensureSceneLayerCreated();
-        mSceneLayer.setTabModelSelector(mTabModelSelector);
-    }
-
-    // StartSurface.OverviewModeObserver implementation.
+        mStartSurfaceObserver = new StartSurface.OverviewModeObserver() {
             @Override
             public void startedShowing() {
                 mAndroidViewFinishedShowing = false;
@@ -125,12 +109,13 @@ public class StartSurfaceLayout extends Layout implements StartSurface.OverviewM
             public void finishedShowing() {
                 mAndroidViewFinishedShowing = true;
                 doneShowing();
-        // The Tab-to-GTS animation is done, and it's time to renew the thumbnail without causing
-        // janky frames.
-        // When animation is off, the thumbnail is already updated when showing the GTS.
+                // The Tab-to-GTS animation is done, and it's time to renew the thumbnail without
+                // causing janky frames. When animation is off, the thumbnail is already updated
+                // when showing the GTS.
                 if (TabUiFeatureUtilities.isTabToGtsAnimationEnabled()) {
                     // Delay thumbnail taking a bit more to make it less likely to happen before the
-            // thumbnail taking triggered by ThumbnailFetcher. See crbug.com/996385 for details.
+                    // thumbnail taking triggered by ThumbnailFetcher. See crbug.com/996385 for
+                    // details.
                     new Handler().postDelayed(() -> {
                         Tab currentTab = mTabModelSelector.getCurrentTab();
                         if (currentTab != null) mTabContentManager.cacheTabThumbnail(currentTab);
@@ -144,16 +129,36 @@ public class StartSurfaceLayout extends Layout implements StartSurface.OverviewM
             @Override
             public void finishedHiding() {
                 // The Android View version of GTS overview is hidden.
-        // If not doing GTS-to-Tab transition animation, we show the fade-out instead, which was
-        // already done.
+                // If not doing GTS-to-Tab transition animation, we show the fade-out instead, which
+                // was already done.
                 if (!TabUiFeatureUtilities.isTabToGtsAnimationEnabled()) {
                     postHiding();
                     return;
                 }
-        // If we are doing GTS-to-Tab transition animation, we start showing the Bitmap version of
-        // the GTS overview in the background while expanding the thumbnail to the viewport.
+                // If we are doing GTS-to-Tab transition animation, we start showing the Bitmap
+                // version of the GTS overview in the background while expanding the thumbnail to
+                // the viewport.
                 expandTab(mTabListDelegate.getThumbnailLocationOfCurrentTab(true));
             }
+        };
+
+        mController.addOverviewModeObserver(mStartSurfaceObserver);
+        mTabListDelegate = mStartSurface.getTabListDelegate();
+        if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) {
+            mThumbnailAspectRatio = (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue();
+            mThumbnailAspectRatio = MathUtils.clamp(mThumbnailAspectRatio, 0.5f, 2.0f);
+        }
+    }
+
+    @Override
+    public void onFinishNativeInitialization() {
+        if (mIsInitialized) return;
+
+        mIsInitialized = true;
+        mStartSurface.initWithNative();
+        ensureSceneLayerCreated();
+        mSceneLayer.setTabModelSelector(mTabModelSelector);
+    }
 
     // Layout implementation.
     @Override
@@ -172,7 +177,7 @@ public class StartSurfaceLayout extends Layout implements StartSurface.OverviewM
     @Override
     public void destroy() {
         if (mController != null) {
-            mController.removeOverviewModeObserver(this);
+            mController.removeOverviewModeObserver(mStartSurfaceObserver);
         }
     }