Update Mac plugin IME handling to match updated spec

chrome/browser/renderer_host/render_widget_host_view_mac.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/CALayer.h>
@@ skipping 102 matching lines @@
 
   // Indicates if doCommandBySelector method receives any edit command when
   // handling a key down event.
   BOOL hasEditCommands_;
 
   // Contains edit commands received by the -doCommandBySelector: method when
   // 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_;
+  // The plugin that currently has focus (-1 if no plugin has focus).
+  int focusedPluginIdentifier_;
+
+  // Whether or not plugin IME is currently enabled active.
+  BOOL pluginImeActive_;
 }
 
 @property(assign, nonatomic) NSRect caretRect;
 
 - (void)setCanBeKeyView:(BOOL)can;
 - (void)setTakesFocusOnlyOnMouseDown:(BOOL)b;
 - (void)setCloseOnDeactivate:(BOOL)b;
 - (void)setToolTipAtMousePoint:(NSString *)string;
 // Set frame, then notify the RenderWidgetHost that the frame has been changed,
 // but do it in a separate task, using |performSelector:withObject:afterDelay:|.
 // This stops the flickering issue in http://crbug.com/31970
 - (void)setFrameWithDeferredUpdate:(NSRect)frame;
 // Notify the RenderWidgetHost that the frame was updated so it can resize
 // its contents.
 - (void)renderWidgetHostWasResized;
 // Cancel ongoing composition (abandon the marked text).
 - (void)cancelComposition;
 // Confirm ongoing composition.
 - (void)confirmComposition;
-// Enables or disables plugin IME for the given plugin.
-- (void)setPluginImeEnabled:(BOOL)enabled forPlugin:(int)pluginId;
+// Enables or disables plugin IME.
+- (void)setPluginImeActive:(BOOL)active;
+// Updates the current plugin focus state.
+- (void)pluginFocusChanged:(BOOL)focused 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
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewMac
 //
 //  An object representing the "View" of a rendered web page. This object is
@@ skipping 56 matching lines @@
   virtual gfx::Rect GetRootWindowRect();
   virtual void SetActive(bool active);
   virtual void SetWindowVisibility(bool visible);
   virtual void WindowFrameChanged();
   virtual void SetBackground(const SkBitmap& background);
   virtual bool ContainsNativeView(gfx::NativeView native_view) const;
 
   virtual void OnAccessibilityNotifications(
       const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params);
 
-  virtual void SetPluginImeEnabled(bool enabled, int plugin_id);
+  virtual void PluginFocusChanged(bool focused, int plugin_id);
+  virtual void StartPluginIme();
   virtual bool PostProcessEventForPluginIme(
       const NativeWebKeyboardEvent& event);
 
   // Methods associated with GPU-accelerated plug-in instances and the
   // accelerated compositor.
   virtual gfx::PluginWindowHandle AllocateFakePluginWindowHandle(bool opaque,
                                                                  bool root);
   virtual void DestroyFakePluginWindowHandle(gfx::PluginWindowHandle window);
 
   // Exposed for testing.
@@ skipping 29 matching lines @@
   // Forces the textures associated with any accelerated plugin instances
   // to be reloaded.
   void ForceTextureReload();
 
   virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate);
 
   void KillSelf();
 
   void SetTextInputActive(bool active);
 
-  // Sends confirmed plugin IME text back to the renderer.
-  void PluginImeCompositionConfirmed(const string16& text, int plugin_id);
+  // Sends completed plugin IME notification and text back to the renderer.
+  void PluginImeCompositionCompleted(const string16& text, int plugin_id);
 
   const std::string& selected_text() const { return selected_text_; }
 
   void UpdateRootGpuViewVisibility(bool show_gpu_widget);
 
   // When rendering transitions from gpu to software, the gpu widget can't be
   // hidden until the software backing store has been updated. This method
   // checks if the GPU view needs to be hidden and hides it if necessary. It
   // should be called after the software backing store has been painted to.
   void HandleDelayedGpuViewHiding();
@@ skipping 81 matching lines @@
 
   // When rendering transitions from gpu to software, the gpu widget can't be
   // hidden until the software backing store has been updated. This variable is
   // set when the gpu widget needs to be hidden once a paint is completed.
   bool needs_gpu_visibility_update_after_repaint_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_