| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index d02766dee16906fffa59bfe305e35e117a22e0e9..6e34a3f39cc26f4cc86838ec5a469673848a0a83 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -2438,7 +2438,7 @@ public class ContentViewCore
|
| @SuppressWarnings("unused")
|
| @CalledByNative
|
| private void showPastePopup(int xDip, int yDip) {
|
| - if (!mHasInsertion) return;
|
| + if (!mHasInsertion || !canPaste()) return;
|
| final float contentOffsetYPix = mRenderCoordinates.getContentOffsetYPix();
|
| getPastePopup().showAt(
|
| (int) mRenderCoordinates.fromDipToPix(xDip),
|
| @@ -2453,16 +2453,17 @@ public class ContentViewCore
|
| mImeAdapter.paste();
|
| hideTextHandles();
|
| }
|
| - public boolean canPaste() {
|
| - if (!mFocusedNodeEditable) return false;
|
| - return ((ClipboardManager) mContext.getSystemService(
|
| - Context.CLIPBOARD_SERVICE)).hasPrimaryClip();
|
| - }
|
| });
|
| }
|
| return mPastePopupMenu;
|
| }
|
|
|
| + private boolean canPaste() {
|
| + if (!mFocusedNodeEditable) return false;
|
| + return ((ClipboardManager) mContext.getSystemService(
|
| + Context.CLIPBOARD_SERVICE)).hasPrimaryClip();
|
| + }
|
| +
|
| @SuppressWarnings("unused")
|
| @CalledByNative
|
| private void onRenderProcessChange() {
|
|
|