| Index: content/renderer/pepper_plugin_delegate_impl.h
|
| diff --git a/content/renderer/pepper_plugin_delegate_impl.h b/content/renderer/pepper_plugin_delegate_impl.h
|
| index b254488cf45a68a221affe3bdd8c439c4e99ac5f..8c6fd52400139de4d1b0eaa120d0f5909b3ae963 100644
|
| --- a/content/renderer/pepper_plugin_delegate_impl.h
|
| +++ b/content/renderer/pepper_plugin_delegate_impl.h
|
| @@ -16,6 +16,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "ppapi/proxy/broker_dispatcher.h"
|
| #include "ppapi/proxy/proxy_channel.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h"
|
| #include "webkit/plugins/ppapi/plugin_delegate.h"
|
| #include "webkit/plugins/ppapi/ppb_broker_impl.h"
|
| #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
|
| @@ -43,6 +44,7 @@ class PluginModule;
|
| }
|
|
|
| namespace WebKit {
|
| +struct WebCompositionUnderline;
|
| class WebFileChooserCompletion;
|
| struct WebFileChooserParams;
|
| }
|
| @@ -162,11 +164,25 @@ class PepperPluginDelegateImpl
|
| // notifies all of the plugins.
|
| void OnSetFocus(bool has_focus);
|
|
|
| - // Returns whether or not a Pepper plugin is focused.
|
| + // IME status.
|
| bool IsPluginFocused() const;
|
| + WebKit::WebRect GetCaretBounds() const;
|
| + WebKit::WebTextInputType GetTextInputType() const;
|
| + bool CanComposeInline() const;
|
| +
|
| + // IME events.
|
| + void OnImeSetComposition(
|
| + const string16& text,
|
| + const std::vector<WebKit::WebCompositionUnderline>& underlines,
|
| + int selection_start,
|
| + int selection_end);
|
| + void OnImeConfirmComposition(const string16& text);
|
|
|
| // PluginDelegate implementation.
|
| - virtual void PluginFocusChanged(bool focused) OVERRIDE;
|
| + virtual void PluginFocusChanged(webkit::ppapi::PluginInstance* instance,
|
| + bool focused) OVERRIDE;
|
| + virtual void PluginTextInputTypeChanged(
|
| + webkit::ppapi::PluginInstance* instance) OVERRIDE;
|
| virtual void PluginCrashed(webkit::ppapi::PluginInstance* instance);
|
| virtual void InstanceCreated(
|
| webkit::ppapi::PluginInstance* instance);
|
| @@ -338,7 +354,10 @@ class PepperPluginDelegateImpl
|
| BrokerMap pending_connect_broker_;
|
|
|
| // Whether or not the focus is on a PPAPI plugin
|
| - bool is_pepper_plugin_focused_;
|
| + webkit::ppapi::PluginInstance* focused_plugin_;
|
| +
|
| + // Current text input composition text. Empty if no composition is on process.
|
| + string16 composition_text_;
|
|
|
| // Set of instances to receive a notification when the enterprise policy has
|
| // been updated.
|
|
|