| Index: third_party/WebKit/Source/core/exported/WebInputMethodControllerImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.h b/third_party/WebKit/Source/core/exported/WebInputMethodControllerImpl.h
|
| similarity index 85%
|
| rename from third_party/WebKit/Source/web/WebInputMethodControllerImpl.h
|
| rename to third_party/WebKit/Source/core/exported/WebInputMethodControllerImpl.h
|
| index 4ecd0c8e69dd759c64057d112fe75a914aa8e4f4..944e919e22a41766d2168b87de92697ffa33cd45 100644
|
| --- a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.h
|
| +++ b/third_party/WebKit/Source/core/exported/WebInputMethodControllerImpl.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef WebInputMethodControllerImpl_h
|
| #define WebInputMethodControllerImpl_h
|
|
|
| +#include "core/CoreExport.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/wtf/Allocator.h"
|
| #include "public/web/WebCompositionUnderline.h"
|
| @@ -14,21 +15,20 @@ namespace blink {
|
|
|
| class InputMethodController;
|
| class LocalFrame;
|
| -class WebLocalFrameImpl;
|
| +class WebLocalFrameBase;
|
| class WebPlugin;
|
| class WebRange;
|
| class WebString;
|
|
|
| -class WebInputMethodControllerImpl : public WebInputMethodController {
|
| +class CORE_EXPORT WebInputMethodControllerImpl
|
| + : public NON_EXPORTED_BASE(WebInputMethodController) {
|
| WTF_MAKE_NONCOPYABLE(WebInputMethodControllerImpl);
|
| DISALLOW_NEW();
|
|
|
| public:
|
| - explicit WebInputMethodControllerImpl(WebLocalFrameImpl& web_frame);
|
| + explicit WebInputMethodControllerImpl(WebLocalFrameBase& web_frame);
|
| ~WebInputMethodControllerImpl() override;
|
|
|
| - static WebInputMethodControllerImpl* FromFrame(LocalFrame*);
|
| -
|
| // WebInputMethodController overrides.
|
| bool SetComposition(const WebString& text,
|
| const WebVector<WebCompositionUnderline>& underlines,
|
| @@ -51,7 +51,7 @@ class WebInputMethodControllerImpl : public WebInputMethodController {
|
| InputMethodController& GetInputMethodController() const;
|
| WebPlugin* FocusedPluginIfInputMethodSupported() const;
|
|
|
| - const Member<WebLocalFrameImpl> web_frame_;
|
| + const Member<WebLocalFrameBase> web_frame_;
|
| };
|
| } // namespace blink
|
|
|
|
|