| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index b3bbe94d5620a07de286dbb360696bb5a4bd656a..5f3a0054abac453ef5fc1160b8a6c94699bc4ba1 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -1541,7 +1541,11 @@ void ContentViewCoreImpl::OnDragEvent(
|
| case JNI_DragEvent::ACTION_DRAG_EXITED:
|
| wcva->OnDragExited();
|
| break;
|
| - default: // STARTED and ENDED. Nothing meaningful to do.
|
| + case JNI_DragEvent::ACTION_DRAG_ENDED:
|
| + wcva->OnDragEnded();
|
| + break;
|
| + case JNI_DragEvent::ACTION_DRAG_STARTED:
|
| + // Nothing meaningful to do.
|
| break;
|
| }
|
| }
|
| @@ -1573,6 +1577,15 @@ void ContentViewCoreImpl::OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip) {
|
| static_cast<jint>(y_dip * dpi_scale()));
|
| }
|
|
|
| +void ContentViewCoreImpl::HidePopupsAndPreserveSelection() {
|
| + JNIEnv* env = AttachCurrentThread();
|
| + ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| + if (obj.is_null())
|
| + return;
|
| +
|
| + Java_ContentViewCore_hidePopupsAndPreserveSelection(env, obj.obj());
|
| +}
|
| +
|
| void ContentViewCoreImpl::OnSmartClipDataExtracted(
|
| const base::string16& text,
|
| const base::string16& html,
|
|
|