diff options
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 09326d1..ffdf00d 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -121,11 +121,8 @@ void BrowserPluginGuest::SetFocus(RenderWidgetHost* rwh, bool focused) { RenderWidgetHostViewBase* rwhv = static_cast<RenderWidgetHostViewBase*>( rwh->GetView()); if (rwhv) { - ViewHostMsg_TextInputState_Params params; - params.type = last_text_input_type_; - params.mode = last_input_mode_; - params.can_compose_inline = last_can_compose_inline_; - rwhv->TextInputStateChanged(params); + rwhv->TextInputTypeChanged(last_text_input_type_, last_input_mode_, + last_can_compose_inline_); } } @@ -496,8 +493,8 @@ bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus) - IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged, - OnTextInputStateChanged) + IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputTypeChanged, + OnTextInputTypeChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -802,15 +799,17 @@ void BrowserPluginGuest::OnTakeFocus(bool reverse) { new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse)); } -void BrowserPluginGuest::OnTextInputStateChanged( - const ViewHostMsg_TextInputState_Params& params) { +void BrowserPluginGuest::OnTextInputTypeChanged(ui::TextInputType type, + ui::TextInputMode input_mode, + bool can_compose_inline) { // Save the state of text input so we can restore it on focus. - last_text_input_type_ = params.type; - last_input_mode_ = params.mode; - last_can_compose_inline_ = params.can_compose_inline; + last_text_input_type_ = type; + last_input_mode_ = input_mode; + last_can_compose_inline_ = can_compose_inline; static_cast<RenderWidgetHostViewBase*>( - web_contents()->GetRenderWidgetHostView())->TextInputStateChanged(params); + web_contents()->GetRenderWidgetHostView())->TextInputTypeChanged( + type, input_mode, can_compose_inline); } void BrowserPluginGuest::OnImeCancelComposition() { |