Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
index c681785cb705010ce713840ddd9c68ad69bc198e..4f1c0177ed4066ecd2789eda9e36610a0e69317d 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
@@ -1602,9 +1602,7 @@ bool RenderWidgetHostViewAura::ChangeTextDirectionAndLayoutAlignment( |
void RenderWidgetHostViewAura::ExtendSelectionAndDelete( |
size_t before, size_t after) { |
- RenderFrameHostImpl* rfh = GetFocusedFrame(); |
- if (rfh) |
- rfh->ExtendSelectionAndDelete(before, after); |
+ host_->ExtendSelectionAndDelete(before, after); |
} |
void RenderWidgetHostViewAura::EnsureCaretInRect(const gfx::Rect& rect) { |
@@ -2982,7 +2980,7 @@ void RenderWidgetHostViewAura::OnUpdateTextInputStateCalled( |
text_input_manager_->GetActiveWidget(); |
last_active_widget_routing_id_ = last_active_widget->GetRoutingID(); |
last_active_widget_process_id_ = last_active_widget->GetProcess()->GetID(); |
- last_active_widget->Send(new InputMsg_RequestCompositionUpdate( |
+ last_active_widget->Send(new InputMsg_ImeRequestCompositionUpdate( |
last_active_widget->GetRoutingID(), false /* immediate request */, |
true /* monitor request */)); |
} else { |
@@ -2991,7 +2989,7 @@ void RenderWidgetHostViewAura::OnUpdateTextInputStateCalled( |
RenderWidgetHostImpl* last_active_widget = RenderWidgetHostImpl::FromID( |
last_active_widget_process_id_, last_active_widget_routing_id_); |
if (last_active_widget) { |
- last_active_widget->Send(new InputMsg_RequestCompositionUpdate( |
+ last_active_widget->Send(new InputMsg_ImeRequestCompositionUpdate( |
last_active_widget->GetRoutingID(), false /* immediate request */, |
false /* monitor request */)); |
} |