Add an interface to gather text surrounding the selection.

content/browser/android/content_view_core_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #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"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "url/gurl.h"
 
 namespace ui {
@@ skipping 190 matching lines @@
                             jobject obj,
                             jint x,
                             jint y,
                             jint width,
                             jint height);
 
   void SetBackgroundOpaque(JNIEnv* env, jobject jobj, jboolean opaque);
 
   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 exposed on the public
ContentViewCore interface.

[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 are hacker style (all lower
case, underscore).

[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 RequestTextSurroundingSelection(), and it looks
like the method would also need to live on the ContentViewCore interface.

[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
   // --------------------------------------------------------------------------
 
   void OnSmartClipDataExtracted(const base::string16& result);
 
   // Creates a popup menu with |items|.
   // |multiple| defines if it should support multi-select.
   // If not |multiple|, |selected_item| sets the initially selected item.
@@ skipping 52 matching lines @@
   // Returns True if the given media should be blocked to load.
   bool ShouldBlockMediaRequest(const GURL& url);
 
   void DidStopFlinging();
 
   // Returns the viewport size after accounting for the viewport offset.
   gfx::Size GetViewSize() const;
 
   void SetAccessibilityEnabledInternal(bool enabled);
 
-  void OnTextSurroundingSelectionResponse(const base::string16& content,
-                                          int start_offset,
-                                          int end_offset);
-
   // --------------------------------------------------------------------------
   // Methods called from native code
   // --------------------------------------------------------------------------
 
   gfx::Size GetPhysicalBackingSize() const;
   gfx::Size GetViewportSizeDip() const;
   gfx::Size GetViewportSizeOffsetDip() const;
   float GetOverdrawBottomHeightDip() const;
 
   void AttachLayer(scoped_refptr<cc::Layer> layer);
@@ skipping 61 matching lines @@
   // The cache of device's current orientation set from Java side, this value
   // will be sent to Renderer once it is ready.
   int device_orientation_;
 
   bool accessibility_enabled_;
 
   // Manages injecting Java objects.
   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);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_