Discourage creation of Java infobars without InfoBarDelegates

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.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.Tab;
-import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.ArrayList;
 
 
 /**
  * A container for all the infobars of a specific tab.
  * Note that infobars creation can be initiated from Java of from native code.
@@ skipping 140 matching lines @@
      * this container.
      */
     public void onParentViewChanged(int tabId, ViewGroup parentView) {
         mTabId = tabId;
         mParentView = parentView;
 
         removeFromParentView();
         addToParentView();
     }
 
-    @Override
-    protected TabObserver createTabObserver() {
-        return new SwipableOverlayViewTabObserver() {
-            @Override
-            public void onPageLoadStarted(Tab tab, String url) {
-                onPageStarted();
-            }
-        };
-    }
-
     /**
      * Adds an InfoBar to the view hierarchy.
      * @param infoBar InfoBar to add to the View hierarchy.
      */
     @CalledByNative
-    public void addInfoBar(InfoBar infoBar) {
+    private void addInfoBar(InfoBar infoBar) {
         assert !mDestroyed;
         if (infoBar == null) {
             return;
         }
         if (mInfoBars.contains(infoBar)) {
             assert false : "Trying to add an info bar that has already been added.";
             return;
         }
         addToParentView();
 
@@ skipping 17 matching lines @@
      * Notifies that an infobar's View ({@link InfoBar#getView}) has changed. If the infobar is
      * visible, a view swapping animation will be run.
      */
     public void notifyInfoBarViewChanged() {
         assert !mDestroyed;
         mLayout.notifyInfoBarViewChanged();
     }
 
     /**
      * Removes an InfoBar from the view hierarchy.
+     *
+     * This should only be called by the base InfoBar class and by tests.
+     *
      * @param infoBar InfoBar to remove from the View hierarchy.
      */
     public void removeInfoBar(InfoBar infoBar) {
         assert !mDestroyed;
 
         if (!mInfoBars.remove(infoBar)) {
             assert false : "Trying to remove an InfoBar that is not in this container.";
             return;
         }
 
         // Notify observers immediately, before any animations begin.
         for (InfoBarContainerObserver observer : mObservers) {
             observer.onRemoveInfoBar(this, infoBar, mInfoBars.isEmpty());
         }
 
         mLayout.removeInfoBar(infoBar);
     }
 
     /**
      * @return True when this container has been emptied and its native counterpart has been
      *         destroyed.
      */
     public boolean hasBeenDestroyed() {
         return mDestroyed;
     }
 
-    // Called by the tab when it has started loading a new page.
-    public void onPageStarted() {
-        ArrayList<InfoBar> barsToRemove = new ArrayList<>();
-
-        for (InfoBar infoBar : mInfoBars) {
-            if (infoBar.shouldExpire()) {
-                barsToRemove.add(infoBar);
-            }
-        }
-
-        for (InfoBar infoBar : barsToRemove) {
-            infoBar.dismissJavaOnlyInfoBar();
-        }
-    }
-
     public void destroy() {
         mDestroyed = true;
         if (mNativeInfoBarContainer != 0) {
             nativeDestroy(mNativeInfoBarContainer);
         }
     }
 
     /**
      * @return all of the InfoBars held in this container.
      */
@@ skipping 14 matching lines @@
     @Override
     protected boolean isAllowedToAutoHide() {
         return sIsAllowedToAutoHide;
     }
 
     private native long nativeInit();
     private native void nativeSetWebContents(
             long nativeInfoBarContainerAndroid, WebContents webContents);
     private native void nativeDestroy(long nativeInfoBarContainerAndroid);
 }