Factor out ContentViewAndroidDelegate

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

 // Copyright 2014 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.tab;
 
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 96 matching lines @@
 import org.chromium.content_public.common.Referrer;
 import org.chromium.content_public.common.ResourceRequestBody;
 import org.chromium.content_public.common.TopControlsState;
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.printing.PrintingControllerImpl;
 import org.chromium.ui.WindowOpenDisposition;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.ui.base.ViewAndroidDelegate;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.lang.ref.WeakReference;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * The basic Java representation of a tab.  Contains and manages a {@link ContentView}.
  * <p>
@@ skipping 1652 matching lines @@
      * rely on the native class to create the JNI association.
      *
      * TODO(dfalcantara): Make this function harder to access.
      */
     public void initializeNative() {
         if (mNativeTabAndroid == 0) nativeInit();
         assert mNativeTabAndroid != 0;
         mIsInitialized = true;
     }
 
+    private static class ChromeViewAndroidDelegate extends ViewAndroidDelegate {
+        private final ViewGroup mContainerView;
+
+        private ChromeViewAndroidDelegate(ViewGroup containerView) {
+            mContainerView = containerView;
+        }
+
+        @Override
+        public ViewGroup getContainerView() {
+            return mContainerView;
+        }
+    };
+
     /**
      * Creates and initializes the {@link ContentViewCore}.
      *
      * @param webContents The WebContents object that will be used to build the
      *                    {@link ContentViewCore}.
      */
     protected void initContentViewCore(WebContents webContents) {
         ContentViewCore cvc = new ContentViewCore(mThemedApplicationContext);
         ContentView cv = ContentView.createContentView(mThemedApplicationContext, cvc);
         cv.setContentDescription(mThemedApplicationContext.getResources().getString(
                 R.string.accessibility_content_view));
-        cvc.initialize(cv, cv, webContents, getWindowAndroid());
+        cvc.initialize(cv, new ChromeViewAndroidDelegate(cv), cv, webContents, getWindowAndroid());
         setContentViewCore(cvc);
         if (getTabModelSelector() instanceof SingleTabModelSelector) {
             getContentViewCore().setFullscreenRequiredForOrientationLock(false);
         }
     }
 
     /**
      * Completes the {@link ContentViewCore} specific initialization around a native WebContents
      * pointer. {@link #getNativePage()} will still return the {@link NativePage} if there is one.
      * All initialization that needs to reoccur after a web contents swap should be added here.
@@ skipping 661 matching lines @@
 
     /** This is currently called when committing a pre-rendered page. */
     @VisibleForTesting
     @CalledByNative
     public void swapWebContents(
             WebContents webContents, boolean didStartLoad, boolean didFinishLoad) {
         ContentViewCore cvc = new ContentViewCore(mThemedApplicationContext);
         ContentView cv = ContentView.createContentView(mThemedApplicationContext, cvc);
         cv.setContentDescription(mThemedApplicationContext.getResources().getString(
                 R.string.accessibility_content_view));
-        cvc.initialize(cv, cv, webContents, getWindowAndroid());
+        cvc.initialize(cv, new ChromeViewAndroidDelegate(cv), cv, webContents, getWindowAndroid());
         swapContentViewCore(cvc, false, didStartLoad, didFinishLoad);
     }
 
     /**
      * Called to swap out the current view with the one passed in.
      *
      * @param newContentViewCore The content view that should be swapped into the tab.
      * @param deleteOldNativeWebContents Whether to delete the native web
      *         contents of old view.
      * @param didStartLoad Whether
@@ skipping 780 matching lines @@
     private native void nativeSetInterceptNavigationDelegate(long nativeTabAndroid,
             InterceptNavigationDelegate delegate);
     private native void nativeAttachToTabContentManager(long nativeTabAndroid,
             TabContentManager tabContentManager);
     private native void nativeAttachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content, boolean visible);
     private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid,
             ContentViewCore content);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
 }