Index: content/browser/android/content_view_core_impl.h |
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h |
index a751e69a8e3750251deef8035fc7de10febe47cd..65e5228a87a6ed2335625b38d9adbef3acdb7753 100644 |
--- a/content/browser/android/content_view_core_impl.h |
+++ b/content/browser/android/content_view_core_impl.h |
@@ -14,6 +14,7 @@ |
#include "base/i18n/rtl.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/process/process.h" |
+#include "content/browser/android/text_surroundings_delegate.h" |
#include "content/browser/renderer_host/render_widget_host_view_android.h" |
#include "content/browser/web_contents/web_contents_impl.h" |
#include "content/public/browser/android/content_view_core.h" |
@@ -224,9 +225,13 @@ class ContentViewCoreImpl : public ContentViewCore, |
jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj); |
- void TextSurroundingSelectionRequest(JNIEnv* env, |
- jobject obj, |
- jint max_length); |
+ void SetTextSurroundingsDelegate(TextSurroundingsDelegate* delegate) { |
jdduke (slow)
2014/06/10 22:08:09
Ah, so looks like we'll need to have this method e
donnd
2014/06/17 22:23:25
Done.
|
+ text_surroundings_delegate_ = delegate; |
David Trainor- moved to gerrit
2014/06/11 17:38:28
body in cc file except for getters/setters that ar
donnd
2014/06/17 22:23:25
Done.
|
+ } |
+ virtual void TextSurroundingSelectionRequest(int max_length); |
jdduke (slow)
2014/06/10 22:08:09
Nit: This should probably read RequestTextSurround
donnd
2014/06/17 22:23:25
Done.
|
+ void OnTextSurroundingSelectionResponse(const base::string16& content, |
+ int start_offset, |
+ int end_offset); |
// -------------------------------------------------------------------------- |
// Public methods that call to Java via JNI |
@@ -299,10 +304,6 @@ class ContentViewCoreImpl : public ContentViewCore, |
void SetAccessibilityEnabledInternal(bool enabled); |
- void OnTextSurroundingSelectionResponse(const base::string16& content, |
- int start_offset, |
- int end_offset); |
- |
// -------------------------------------------------------------------------- |
// Methods called from native code |
// -------------------------------------------------------------------------- |
@@ -384,6 +385,8 @@ class ContentViewCoreImpl : public ContentViewCore, |
scoped_ptr<JavaBridgeDispatcherHostManager> |
java_bridge_dispatcher_host_manager_; |
+ TextSurroundingsDelegate* text_surroundings_delegate_; |
jdduke (slow)
2014/06/10 22:08:09
You'll want to NULL this in the constructor.
donnd
2014/06/17 22:23:25
Done.
|
+ |
DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); |
}; |