Merge 62820 - Implement IME for Mac plugins using the Cocoa event model on 10...

chrome/common/plugin_messages_internal.h

Index: chrome/common/plugin_messages_internal.h
===================================================================
--- chrome/common/plugin_messages_internal.h	(revision 62862)
+++ chrome/common/plugin_messages_internal.h	(working copy)
@@ -238,6 +238,9 @@
   IPC_MESSAGE_ROUTED2(PluginMsg_WindowFrameChanged,
                       gfx::Rect /* window_frame */,
                       gfx::Rect /* view_frame */)
+
+  IPC_MESSAGE_ROUTED1(PluginMsg_ImeCompositionConfirmed,
+                      string16 /* text */)
 #endif
 
   IPC_SYNC_MESSAGE_ROUTED2_0(PluginMsg_WillSendRequest,
@@ -402,6 +405,9 @@
   IPC_MESSAGE_ROUTED1(PluginHostMsg_UpdateGeometry_ACK,
                       int /* ack_key */)
 
+  IPC_MESSAGE_ROUTED1(PluginHostMsg_SetImeEnabled,
+                      bool /* enabled */)
+
   // This message, used in Mac OS X 10.5 and earlier, is sent from the plug-in
   // process to the renderer process to indicate that the plug-in allocated a
   // new TransportDIB that holds the GPU's rendered image.  This information is