| Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| index d962d9f292d144a1577c06d4da1afe675f3961b7..2b1aa874a4016432d2ac30157a071d4333346a56 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -5,15 +5,12 @@
|
| package org.chromium.android_webview;
|
|
|
| import android.content.ComponentCallbacks2;
|
| -import android.content.Context;
|
| -import android.content.pm.PackageManager;
|
| import android.content.res.Configuration;
|
| import android.graphics.Bitmap;
|
| import android.graphics.Canvas;
|
| import android.graphics.Color;
|
| import android.graphics.Picture;
|
| import android.graphics.Rect;
|
| -import android.graphics.drawable.Drawable;
|
| import android.net.http.SslCertificate;
|
| import android.os.AsyncTask;
|
| import android.os.Build;
|
| @@ -25,7 +22,6 @@ import android.view.KeyEvent;
|
| import android.view.MotionEvent;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
| -import android.view.ViewTreeObserver;
|
| import android.view.accessibility.AccessibilityEvent;
|
| import android.view.accessibility.AccessibilityNodeInfo;
|
| import android.view.accessibility.AccessibilityNodeProvider;
|
| @@ -41,7 +37,6 @@ import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.content.browser.ContentSettings;
|
| -import org.chromium.content.browser.ContentVideoView;
|
| import org.chromium.content.browser.ContentViewClient;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content.browser.ContentViewStatics;
|
| @@ -51,7 +46,6 @@ import org.chromium.content.browser.PageTransitionTypes;
|
| import org.chromium.content.common.CleanupReference;
|
| import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
|
| import org.chromium.components.navigation_interception.NavigationParams;
|
| -import org.chromium.net.GURLUtils;
|
| import org.chromium.ui.gfx.DeviceDisplayInfo;
|
|
|
| import java.io.File;
|
| @@ -144,6 +138,7 @@ public class AwContents {
|
| private final ViewGroup mContainerView;
|
| private ContentViewCore mContentViewCore;
|
| private final AwContentsClient mContentsClient;
|
| + private final AwContentsViewClient mContentsViewClient;
|
| private final AwContentsClientBridge mContentsClientBridge;
|
| private final AwWebContentsDelegate mWebContentsDelegate;
|
| private final AwContentsIoThreadClient mIoThreadClient;
|
| @@ -531,6 +526,7 @@ public class AwContents {
|
| mContainerView = containerView;
|
| mInternalAccessAdapter = internalAccessAdapter;
|
| mContentsClient = contentsClient;
|
| + mContentsViewClient = new AwContentsViewClient(contentsClient, settings);
|
| mLayoutSizer = layoutSizer;
|
| mSettings = settings;
|
| mDIPScale = DeviceDisplayInfo.create(mContainerView.getContext()).getDIPScale();
|
| @@ -597,8 +593,7 @@ public class AwContents {
|
| int nativeWebContents = nativeGetWebContents(mNativeAwContents);
|
| mContentViewCore = createAndInitializeContentViewCore(
|
| mContainerView, mInternalAccessAdapter, nativeWebContents,
|
| - new AwGestureStateListener(), mContentsClient.getContentViewClient(),
|
| - mZoomControls);
|
| + new AwGestureStateListener(), mContentsViewClient, mZoomControls);
|
| nativeSetJavaPeers(mNativeAwContents, this, mWebContentsDelegate, mContentsClientBridge,
|
| mIoThreadClient, mInterceptNavigationDelegate);
|
| mContentsClient.installWebContentsObserver(mContentViewCore);
|
|
|