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 6c35e91c88d3d9deae8eaec02f51ca3c82ef815a..7043118a08eafa5f7f68133a145eff1cbebf065a 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 |
@@ -9,7 +9,6 @@ import android.annotation.TargetApi; |
import android.app.assist.AssistStructure.ViewNode; |
import android.content.ClipData; |
import android.content.ClipDescription; |
-import android.content.ClipboardManager; |
import android.content.Context; |
import android.content.Intent; |
import android.content.res.Configuration; |
@@ -1742,19 +1741,14 @@ public class ContentViewCore |
} |
@CalledByNative |
- private void showPastePopup(int x, int y, boolean canSelectAll) { |
- mSelectionPopupController.createAndShowPastePopup(x, y, canSelectAll); |
+ private void showPastePopup(int x, int y, boolean canSelectAll, boolean canEditRichly) { |
+ mSelectionPopupController.createAndShowPastePopup(x, y, canSelectAll, canEditRichly); |
} |
private void destroyPastePopup() { |
mSelectionPopupController.destroyPastePopup(); |
} |
- private boolean canPaste() { |
- return ((ClipboardManager) mContext.getSystemService( |
- Context.CLIPBOARD_SERVICE)).hasPrimaryClip(); |
- } |
- |
@SuppressWarnings("unused") |
@CalledByNative |
private void onRenderProcessChange() { |