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

chrome/browser/renderer_host/render_widget_host_view_mac.h

Index: chrome/browser/renderer_host/render_widget_host_view_mac.h
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_mac.h	(revision 62862)
+++ chrome/browser/renderer_host/render_widget_host_view_mac.h	(working copy)
@@ -124,6 +124,9 @@
   // handling a key down event, not including inserting commands, eg. insertTab,
   // etc.
   EditCommands editCommands_;
+
+  // The plugin for which IME is currently enabled (-1 if not enabled).
+  int pluginImeIdentifier_;
 }
 
 @property(assign, nonatomic) NSRect caretRect;
@@ -145,6 +148,11 @@
 - (void)setAccessibilityTree:(const webkit_glue::WebAccessibility&) tree;
 // Confirm ongoing composition.
 - (void)confirmComposition;
+// Enables or disables plugin IME for the given plugin.
+- (void)setPluginImeEnabled:(BOOL)enabled forPlugin:(int)pluginId;
+// Evaluates the event in the context of plugin IME, if plugin IME is enabled.
+// Returns YES if the event was handled.
+- (BOOL)postProcessEventForPluginIme:(NSEvent*)event;
 
 @end
 
@@ -222,6 +230,10 @@
   virtual bool ContainsNativeView(gfx::NativeView native_view) const;
   virtual void UpdateAccessibilityTree(
       const webkit_glue::WebAccessibility& tree);
+  virtual void SetPluginImeEnabled(bool enabled, int plugin_id);
+  virtual bool PostProcessEventForPluginIme(
+      const NativeWebKeyboardEvent& event);
+
   // Methods associated with GPU-accelerated plug-in instances and the
   // accelerated compositor.
   virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle(bool opaque,
@@ -261,6 +273,9 @@
 
   void SetTextInputActive(bool active);
 
+  // Sends confirmed plugin IME text back to the renderer.
+  void PluginImeCompositionConfirmed(const string16& text, int plugin_id);
+
   const std::string& selected_text() const { return selected_text_; }
 
   // These member variables should be private, but the associated ObjC class