Index: content/browser/renderer_host/render_widget_host_view_aura.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h |
index 16749dd4891a0d05c71d01d27445235249d1c4f9..4330ac9102fc6929a6be3dff0e2937eb9db6908a 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -84,6 +84,7 @@ class RenderFrameHostImpl; |
class RenderViewHostDelegateView; |
class RenderWidgetHostImpl; |
class RenderWidgetHostView; |
+class TextInputManager; |
class TouchSelectionControllerClientAura; |
struct TextInputState; |
@@ -134,7 +135,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
void Focus() override; |
void UpdateCursor(const WebCursor& cursor) override; |
void SetIsLoading(bool is_loading) override; |
- void TextInputStateChanged(const TextInputState& params) override; |
void ImeCancelComposition() override; |
void ImeCompositionRangeChanged( |
const gfx::Range& range, |
@@ -353,6 +353,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
private: |
friend class RenderWidgetHostViewAuraCopyRequestTest; |
+ friend class TestInputMethodObserver; |
FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, |
PopupRetainsCaptureAfterMouseRelease); |
FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText); |
@@ -528,6 +529,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// NULL on failure. |
RenderViewHostDelegateView* GetRenderViewHostDelegateView(); |
+ void OnTextInputStateUpdated(TextInputManager* text_input_manager, |
+ RenderWidgetHostViewBase* updated_view, |
+ bool changed) override; |
+ |
// The model object. |
RenderWidgetHostImpl* const host_; |
@@ -571,14 +576,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// object. |
ui::MotionEventAura pointer_state_; |
- // The current text input type. |
- ui::TextInputType text_input_type_; |
- // The current text input mode corresponding to HTML5 inputmode attribute. |
- ui::TextInputMode text_input_mode_; |
- // The current text input flags. |
- int text_input_flags_; |
- bool can_compose_inline_; |
- |
// Bounds for the selection. |
ui::SelectionBound selection_anchor_; |
ui::SelectionBound selection_focus_; |