Refactor the view hierarchy of snackbars and infobars

chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.banners.SwipableOverlayView;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabContentViewParent;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.ArrayList;
 
 
 /**
@@ skipping 57 matching lines @@
     }
 
     /** Resets the state of the InfoBarContainer when the user navigates. */
     private final TabObserver mTabObserver = new EmptyTabObserver() {
         @Override
         public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
                 boolean isNavigationToDifferentPage, boolean isFragmentNavigation,
                 int statusCode) {
             setIsObscuredByOtherView(false);
         }
+
+        @Override
+        public void onContentChanged(Tab tab) {
+            if (mTabView == tab.getView()) return;
+            mTabView.removeOnAttachStateChangeListener(mAttachedStateListener);
+            mTabView = tab.getView();
+            mTabView.addOnAttachStateChangeListener(mAttachedStateListener);
+        }
+    };
+
+    /**
+     * Adds/removes the {@link InfoBarContainer} when the tab's view is attached/detached. This is
+     * mostly to ensure the infobars are not shown in tab switcher overview mode.
+     */
+    private final OnAttachStateChangeListener mAttachedStateListener =
+            new OnAttachStateChangeListener() {
+        @Override
+        public void onViewDetachedFromWindow(View v) {
+            removeFromParentView();
+        }
+
+        @Override
+        public void onViewAttachedToWindow(View v) {
+            addToParentView();
+        }
     };
 
     private final InfoBarContainerLayout mLayout;
 
     /** Native InfoBarContainer pointer which will be set by nativeInit(). */
     private final long mNativeInfoBarContainer;
 
     /** The list of all InfoBars in this container, regardless of whether they've been shown yet. */
     private final ArrayList<InfoBar> mInfoBars = new ArrayList<InfoBar>();
 
     /** True when this container has been emptied and its native counterpart has been destroyed. */
     private boolean mDestroyed;
 
-    /** The id of the tab associated with us. Set to Tab.INVALID_TAB_ID if no tab is associated. */
-    private int mTabId;
+    /** Parent view that contains the InfoBarContainerLayout. */
+    private ViewGroup mParentView;
 
-    /** Parent view that contains the InfoBarContainerLayout. */
-    private TabContentViewParent mParentView;
+    /** The view that {@link Tab#getView()} returns. */
+    private View mTabView;
 
     /** Whether or not another View is occupying the same space as this one. */
     private boolean mIsObscured;
 
     private final ObserverList<InfoBarContainerObserver> mObservers =
             new ObserverList<InfoBarContainerObserver>();
 
-    public InfoBarContainer(Context context, int tabId, TabContentViewParent parentView, Tab tab) {
+    public InfoBarContainer(Context context, final ViewGroup parentView, Tab tab) {
         super(context, null);
         tab.addObserver(mTabObserver);
+        mTabView = tab.getView();
 
         // TODO(newt): move this workaround into the infobar views if/when they're scrollable.
         // Workaround for http://crbug.com/407149. See explanation in onMeasure() below.
         setVerticalScrollBarEnabled(false);
 
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
                 LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM);
         int topMarginDp = DeviceFormFactor.isTablet(context)
                 ? TOP_MARGIN_TABLET_DP : TOP_MARGIN_PHONE_DP;
         lp.topMargin = Math.round(topMarginDp * getResources().getDisplayMetrics().density);
         setLayoutParams(lp);
 
-        mTabId = tabId;
         mParentView = parentView;
 
         mLayout = new InfoBarContainerLayout(context);
         addView(mLayout, new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
                 LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL));
 
         // Chromium's InfoBarContainer may add an InfoBar immediately during this initialization
         // call, so make sure everything in the InfoBarContainer is completely ready beforehand.
         mNativeInfoBarContainer = nativeInit();
     }
@@ skipping 15 matching lines @@
     }
 
     @Override
     public void setContentViewCore(ContentViewCore contentViewCore) {
         super.setContentViewCore(contentViewCore);
         if (getContentViewCore() != null) {
             nativeSetWebContents(mNativeInfoBarContainer, contentViewCore.getWebContents());
         }
     }
 
+    /**
+     * Sets the parent {@link ViewGroup} that contains the {@link InfoBarContainer}.
+     */
+    public void setParentView(ViewGroup parent) {
+        mParentView = parent;
+        removeFromParentView();
+        addToParentView();
+    }
+
     @VisibleForTesting
     public void setAnimationListener(InfoBarAnimationListener listener) {
         mLayout.setAnimationListener(listener);
     }
 
     /**
      * Returns true if any animations are pending or in progress.
      */
     @VisibleForTesting
     public boolean isAnimating() {
         return mLayout.isAnimating();
     }
 
     private void addToParentView() {
         super.addToParentView(mParentView);
     }
 
     /**
-     * Called when the parent {@link android.view.ViewGroup} has changed for
-     * this container.
-     */
-    public void onParentViewChanged(int tabId, TabContentViewParent parentView) {
-        mTabId = tabId;
-        mParentView = parentView;
-
-        removeFromParentView();
-        addToParentView();
-    }
-
-    /**
      * Adds an InfoBar to the view hierarchy.
      * @param infoBar InfoBar to add to the View hierarchy.
      */
     @CalledByNative
     private void addInfoBar(InfoBar infoBar) {
         assert !mDestroyed;
         if (infoBar == null) {
             return;
         }
         if (mInfoBars.contains(infoBar)) {
@@ skipping 150 matching lines @@
         }
 
         super.onLayout(changed, l, t, r, b);
     }
 
     private native long nativeInit();
     private native void nativeSetWebContents(
             long nativeInfoBarContainerAndroid, WebContents webContents);
     private native void nativeDestroy(long nativeInfoBarContainerAndroid);
 }