Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.h |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h |
| index 256fb132efcfca6c06b36da43d11a5757de786bf..326b78803ac9bd6ef7d702b0e8296c03714509db 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.h |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.h |
| @@ -20,6 +20,7 @@ |
| #include "content/browser/renderer_host/delegated_frame_evictor.h" |
| #include "content/browser/renderer_host/image_transport_factory_android.h" |
| #include "content/browser/renderer_host/ime_adapter_android.h" |
| +#include "content/browser/renderer_host/input/gesture_text_selector.h" |
| #include "content/browser/renderer_host/render_widget_host_view_base.h" |
| #include "content/common/content_export.h" |
| #include "gpu/command_buffer/common/mailbox.h" |
| @@ -50,6 +51,7 @@ class WebMouseEvent; |
| namespace content { |
| class ContentViewCoreImpl; |
| +class GestureTextSelector; |
|
jdduke (slow)
2014/06/26 00:33:21
Nit: No need for forward decl when we include the
Changwan Ryu
2014/06/26 02:54:10
Done.
|
| class OverscrollGlow; |
| class RenderWidgetHost; |
| class RenderWidgetHostImpl; |
| @@ -65,7 +67,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
| public ImageTransportFactoryAndroidObserver, |
| public ui::GestureProviderClient, |
| public ui::WindowAndroidObserver, |
| - public DelegatedFrameEvictorClient { |
| + public DelegatedFrameEvictorClient, |
| + public GestureTextSelectorClient { |
| public: |
| RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget, |
| ContentViewCoreImpl* content_view_core); |
| @@ -231,6 +234,11 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
| void SetTextSurroundingSelectionCallback( |
| const TextSurroundingSelectionCallback& callback); |
| + // GestureTextSelectorClient implementation. |
| + virtual void ShowSelectionHandlesAutomatically() OVERRIDE; |
|
aelias_OOO_until_Jul13
2014/06/26 01:12:39
nit: move these up next to the other virtual metho
Changwan Ryu
2014/06/26 02:54:10
Done.
|
| + virtual void SelectRange(float x1, float y1, float x2, float y2) OVERRIDE; |
| + virtual void Unselect() OVERRIDE; |
| + |
| private: |
| void RunAckCallbacks(); |
| @@ -335,6 +343,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid |
| // Android MotionEvent's) and touch event acks. |
| ui::FilteredGestureProvider gesture_provider_; |
| + // Handles gesture based text selection |
| + GestureTextSelector gesture_text_selector_; |
| + |
| bool flush_input_requested_; |
| int accelerated_surface_route_id_; |