| Index: content/browser/browser_plugin/browser_plugin_guest.cc
|
| diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| index 092a045c62714642a4b6c065a1a139e97ab3f8bd..359d53a20daea7fd8787a603edafd186a2c70d8b 100644
|
| --- a/content/browser/browser_plugin/browser_plugin_guest.cc
|
| +++ b/content/browser/browser_plugin/browser_plugin_guest.cc
|
| @@ -573,14 +573,6 @@ void BrowserPluginGuest::SendTextInputTypeChangedToView(
|
|
|
| guest_rwhv->TextInputTypeChanged(last_text_input_type_, last_input_mode_,
|
| last_can_compose_inline_, last_input_flags_);
|
| - // Enable input method for guest if it's enabled for the embedder.
|
| - if (!static_cast<RenderViewHostImpl*>(
|
| - owner_web_contents_->GetRenderViewHost())->input_method_active()) {
|
| - return;
|
| - }
|
| - RenderViewHostImpl* guest_rvh =
|
| - static_cast<RenderViewHostImpl*>(GetWebContents()->GetRenderViewHost());
|
| - guest_rvh->SetInputMethodActive(true);
|
| }
|
|
|
| void BrowserPluginGuest::DidCommitProvisionalLoadForFrame(
|
| @@ -749,18 +741,9 @@ void BrowserPluginGuest::OnWillAttachComplete(
|
|
|
| delegate_->DidAttach(GetGuestProxyRoutingID());
|
|
|
| - if (!use_site_per_process) {
|
| + if (!use_site_per_process)
|
| has_render_view_ = true;
|
|
|
| - // Enable input method for guest if it's enabled for the embedder.
|
| - if (static_cast<RenderViewHostImpl*>(
|
| - owner_web_contents_->GetRenderViewHost())->input_method_active()) {
|
| - RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
|
| - GetWebContents()->GetRenderViewHost());
|
| - guest_rvh->SetInputMethodActive(true);
|
| - }
|
| - }
|
| -
|
| RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Attached"));
|
| }
|
|
|
|
|