Chromium Code Reviews| Index: blimp/engine/session/blimp_engine_session.h |
| diff --git a/blimp/engine/session/blimp_engine_session.h b/blimp/engine/session/blimp_engine_session.h |
| index 0b8c91f461415e75afa4e5e8f78df4a0ec8f656c..0b23fd2196ff559c8adfec4e2afb936c62727a60 100644 |
| --- a/blimp/engine/session/blimp_engine_session.h |
| +++ b/blimp/engine/session/blimp_engine_session.h |
| @@ -19,10 +19,10 @@ |
| #include "blimp/net/blimp_message_processor.h" |
| #include "blimp/net/blob_channel/blob_channel_sender_impl.h" |
| #include "blimp/net/connection_error_observer.h" |
| +#include "content/browser/renderer_host/text_input_manager.h" |
|
EhsanK
2016/09/28 16:14:11
Whether or not exposing RWHVBase and TextInputMana
|
| #include "content/public/browser/invalidate_type.h" |
| #include "content/public/browser/web_contents_delegate.h" |
| #include "net/base/completion_callback.h" |
| -#include "ui/base/ime/input_method_observer.h" |
| #include "ui/gfx/geometry/size.h" |
| namespace aura { |
| @@ -74,7 +74,7 @@ class Tab; |
| class BlimpEngineSession : public BlimpMessageProcessor, |
| public content::WebContentsDelegate, |
| - public ui::InputMethodObserver { |
| + public content::TextInputManager::Observer { |
| public: |
| using GetPortCallback = base::Callback<void(uint16_t)>; |
| @@ -143,14 +143,11 @@ class BlimpEngineSession : public BlimpMessageProcessor, |
| void NavigationStateChanged(content::WebContents* source, |
| content::InvalidateTypes changed_flags) override; |
| - // ui::InputMethodObserver overrides. |
| - void OnTextInputTypeChanged(const ui::TextInputClient* client) override; |
| - void OnFocus() override; |
| - void OnBlur() override; |
| - void OnCaretBoundsChanged(const ui::TextInputClient* client) override; |
| - void OnTextInputStateChanged(const ui::TextInputClient* client) override; |
| - void OnInputMethodDestroyed(const ui::InputMethod* input_method) override; |
| - void OnShowImeIfNeeded() override; |
| + // content::TextInputManager overrides. |
| + void OnUpdateTextInputStateCalled( |
| + content::TextInputManager* text_input_manager, |
| + content::RenderWidgetHostViewBase* updated_view, |
| + bool did_update_state) override; |
| // Sets up |new_contents| to be associated with the root window. |
| void PlatformSetContents(std::unique_ptr<content::WebContents> new_contents, |