Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 1234193002: Simplify InputMethodWin initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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"));
}
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_impl.h » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698