| 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 a21d244fd978a3570cf0eac90c6aaed2b7d85eee..1c5e8a9366a2ed30d2fe8473e7fb90aab6b35078 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
|
| @@ -28,6 +28,7 @@ import android.os.SystemClock;
|
| import android.text.TextUtils;
|
| import android.util.Base64;
|
| import android.util.Pair;
|
| +import android.view.ActionMode;
|
| import android.view.DragEvent;
|
| import android.view.KeyEvent;
|
| import android.view.MotionEvent;
|
| @@ -821,8 +822,9 @@ public class AwContents implements SmartClipProvider,
|
| InternalAccessDelegate internalDispatcher, WebContents webContents,
|
| GestureStateListener gestureStateListener, ContentViewClient contentViewClient,
|
| ContentViewCore.ZoomControlsDelegate zoomControlsDelegate,
|
| - WindowAndroid windowAndroid) {
|
| - contentViewCore.initialize(viewDelegate, internalDispatcher, webContents, windowAndroid);
|
| + WindowAndroid windowAndroid, ActionMode.Callback actionModeCallback) {
|
| + contentViewCore.initialize(viewDelegate, internalDispatcher, webContents, windowAndroid,
|
| + actionModeCallback);
|
| contentViewCore.addGestureStateListener(gestureStateListener);
|
| contentViewCore.setContentViewClient(contentViewClient);
|
| contentViewCore.setZoomControlsDelegate(zoomControlsDelegate);
|
| @@ -1057,7 +1059,8 @@ public class AwContents implements SmartClipProvider,
|
| mContentViewCore.getRenderCoordinates());
|
| initializeContentViewCore(mContentViewCore, mContext, mViewAndroidDelegate,
|
| mInternalAccessAdapter, webContents, new AwGestureStateListener(),
|
| - mContentViewClient, mZoomControls, mWindowAndroid.getWindowAndroid());
|
| + mContentViewClient, mZoomControls, mWindowAndroid.getWindowAndroid(),
|
| + new AwActionModeCallback(this, mContentViewCore.getActionModeDelegate()));
|
| nativeSetJavaPeers(mNativeAwContents, this, mWebContentsDelegate, mContentsClientBridge,
|
| mIoThreadClient, mInterceptNavigationDelegate);
|
| mWebContents = mContentViewCore.getWebContents();
|
|
|