| 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 af1f00a5dea63099605fbe3f983275a370ff0640..07c28763febb96e67a8c8bf468498bc1afc48b52 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.h
|
| @@ -52,6 +52,7 @@ class ImeAdapterAndroid;
|
| class OverscrollControllerAndroid;
|
| class RenderWidgetHost;
|
| class RenderWidgetHostImpl;
|
| +class SelectionPopupController;
|
| class SynchronousCompositorHost;
|
| class SynchronousCompositorClient;
|
| struct NativeWebKeyboardEvent;
|
| @@ -229,6 +230,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| ime_adapter_android_ = ime_adapter;
|
| }
|
|
|
| + void set_selection_popup_controller(SelectionPopupController* controller) {
|
| + selection_popup_controller_ = controller;
|
| + }
|
| +
|
| base::WeakPtr<RenderWidgetHostViewAndroid> GetWeakPtrAndroid();
|
|
|
| bool OnTouchEvent(const ui::MotionEvent& event);
|
| @@ -351,6 +356,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
| // Body background color of the underlying document.
|
| SkColor cached_background_color_;
|
|
|
| + SelectionPopupController* selection_popup_controller_;
|
| +
|
| mutable ui::ViewAndroid view_;
|
|
|
| // Manages the Compositor Frames received from the renderer.
|
| @@ -375,7 +382,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
|
|
|
| // Manages selection handle rendering and manipulation.
|
| // This will always be NULL if |content_view_core_| is NULL.
|
| - std::unique_ptr<ui::TouchSelectionController> selection_controller_;
|
| + std::unique_ptr<ui::TouchSelectionController> touch_selection_controller_;
|
|
|
| // Bounds to use if we have no backing ContentViewCore
|
| gfx::Rect default_bounds_;
|
|
|