| Index: chrome/renderer/render_view.cc
|
| diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
|
| index a81aae07fa3e458d6c2c592b9be186b104fcc09a..d2f9250628c9898d49aefdbb380e9546278c38be 100644
|
| --- a/chrome/renderer/render_view.cc
|
| +++ b/chrome/renderer/render_view.cc
|
| @@ -1070,8 +1070,8 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
|
| #if defined(OS_MACOSX)
|
| IPC_MESSAGE_HANDLER(ViewMsg_SetWindowVisibility, OnSetWindowVisibility)
|
| IPC_MESSAGE_HANDLER(ViewMsg_WindowFrameChanged, OnWindowFrameChanged)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionConfirmed,
|
| - OnPluginImeCompositionConfirmed)
|
| + IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted,
|
| + OnPluginImeCompositionCompleted)
|
| #endif
|
| IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent,
|
| OnSetEditCommandsForNextKeyEvent)
|
| @@ -5236,14 +5236,14 @@ void RenderView::OnWindowFrameChanged(const gfx::Rect& window_frame,
|
| }
|
| }
|
|
|
| -void RenderView::OnPluginImeCompositionConfirmed(const string16& text,
|
| +void RenderView::OnPluginImeCompositionCompleted(const string16& text,
|
| int plugin_id) {
|
| - // WebPluginDelegateProxy is responsible for figuring out if this text
|
| + // WebPluginDelegateProxy is responsible for figuring out if this event
|
| // applies to it or not, so inform all the delegates.
|
| std::set<WebPluginDelegateProxy*>::iterator plugin_it;
|
| for (plugin_it = plugin_delegates_.begin();
|
| plugin_it != plugin_delegates_.end(); ++plugin_it) {
|
| - (*plugin_it)->ImeCompositionConfirmed(text, plugin_id);
|
| + (*plugin_it)->ImeCompositionCompleted(text, plugin_id);
|
| }
|
| }
|
| #endif // OS_MACOSX
|
| @@ -5502,9 +5502,14 @@ void RenderView::EnsureDocumentTag() {
|
| }
|
|
|
| #if defined(OS_MACOSX)
|
| -void RenderView::SetPluginImeEnabled(bool enabled, int plugin_id) {
|
| - IPC::Message* msg = new ViewHostMsg_SetPluginImeEnabled(routing_id(),
|
| - enabled, plugin_id);
|
| +void RenderView::PluginFocusChanged(bool focused, int plugin_id) {
|
| + IPC::Message* msg = new ViewHostMsg_PluginFocusChanged(routing_id(),
|
| + focused, plugin_id);
|
| + Send(msg);
|
| +}
|
| +
|
| +void RenderView::StartPluginIme() {
|
| + IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id());
|
| // This message can be sent during event-handling, and needs to be delivered
|
| // within that context.
|
| msg->set_unblock(true);
|
|
|