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

Unified Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 6259013: Update Mac plugin IME handling to match updated spec (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk Created 9 years, 11 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
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.h ('k') | third_party/mozilla/ComplexTextInputPanel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_proxy.cc
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index dcfe8c1596558e77edd93cf3b5ab7649a2ad6b57..e5c50ec79a3795d64ae09b8e3b73c9d3e31f6de0 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -457,8 +457,10 @@ bool WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) {
OnDeferResourceLoading)
#if defined(OS_MACOSX)
- IPC_MESSAGE_HANDLER(PluginHostMsg_SetImeEnabled,
- OnSetImeEnabled);
+ IPC_MESSAGE_HANDLER(PluginHostMsg_FocusChanged,
+ OnFocusChanged);
+ IPC_MESSAGE_HANDLER(PluginHostMsg_StartIme,
+ OnStartIme);
IPC_MESSAGE_HANDLER(PluginHostMsg_BindFakePluginWindowHandle,
OnBindFakePluginWindowHandle);
IPC_MESSAGE_HANDLER(PluginHostMsg_UpdateGeometry_ACK,
@@ -1016,13 +1018,13 @@ void WebPluginDelegateProxy::WindowFrameChanged(gfx::Rect window_frame,
msg->set_unblock(true);
Send(msg);
}
-void WebPluginDelegateProxy::ImeCompositionConfirmed(const string16& text,
+void WebPluginDelegateProxy::ImeCompositionCompleted(const string16& text,
int plugin_id) {
- // If the text isn't intended for this plugin, there's nothing to do.
+ // If the message isn't intended for this plugin, there's nothing to do.
if (instance_id_ != plugin_id)
return;
- IPC::Message* msg = new PluginMsg_ImeCompositionConfirmed(instance_id_,
+ IPC::Message* msg = new PluginMsg_ImeCompositionCompleted(instance_id_,
text);
// Order relative to other key events is important.
msg->set_unblock(true);
@@ -1376,9 +1378,14 @@ WebPluginDelegateProxy::CreateSeekableResourceClient(
}
#if defined(OS_MACOSX)
-void WebPluginDelegateProxy::OnSetImeEnabled(bool enabled) {
+void WebPluginDelegateProxy::OnFocusChanged(bool focused) {
if (render_view_)
- render_view_->SetPluginImeEnabled(enabled, instance_id_);
+ render_view_->PluginFocusChanged(focused, instance_id_);
+}
+
+void WebPluginDelegateProxy::OnStartIme() {
+ if (render_view_)
+ render_view_->StartPluginIme();
}
void WebPluginDelegateProxy::OnBindFakePluginWindowHandle(bool opaque) {
« no previous file with comments | « chrome/renderer/webplugin_delegate_proxy.h ('k') | third_party/mozilla/ComplexTextInputPanel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698