summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorshashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 01:40:02 +0000
committershashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 01:40:02 +0000
commit7c98b11705e7ce52d0ec0e27a9e2699cffba5428 (patch)
tree341d1dc6cb06bb90097275ac9c94e4c74833a9ea /content/browser
parent9dcbad2484d8ea7eaf50ed7bf3a176234c18be71 (diff)
downloadchromium_src-7c98b11705e7ce52d0ec0e27a9e2699cffba5428.zip
chromium_src-7c98b11705e7ce52d0ec0e27a9e2699cffba5428.tar.gz
chromium_src-7c98b11705e7ce52d0ec0e27a9e2699cffba5428.tar.bz2
Upstream Android implementation of WebContentsViewDelegate.
BUG=136075 Review URL: https://chromiumcodereview.appspot.com/10993089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/android/content_view_core_impl.cc9
-rw-r--r--content/browser/android/content_view_core_impl.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index b18831b..f6ff243 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -379,6 +379,15 @@ void ContentViewCoreImpl::OnSelectionBoundsChanged(
end_dir);
}
+void ContentViewCoreImpl::ShowPastePopup(int x, int y) {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+ if (obj.is_null())
+ return;
+ Java_ContentViewCore_showPastePopup(env, obj.obj(), static_cast<jint>(x),
+ static_cast<jint>(y));
+}
+
void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index 5ba4a661..d054477 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -49,6 +49,7 @@ class ContentViewCoreImpl : public ContentViewCore,
virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
virtual void OnWebPreferencesUpdated() OVERRIDE;
virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
+ virtual void ShowPastePopup(int x, int y) OVERRIDE;
// --------------------------------------------------------------------------
// Methods called from Java via JNI