Index: ui/base/ime/mock_input_method.cc |
diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc |
index 0aa2005cb1d893d26ee29a84796158cc911265f8..5ffc76fc1dc108d5e8e3d2d07322bde6bb8793c4 100644 |
--- a/ui/base/ime/mock_input_method.cc |
+++ b/ui/base/ime/mock_input_method.cc |
@@ -4,6 +4,9 @@ |
#include "ui/base/ime/mock_input_method.h" |
+#include "ui/base/ime/text_input_focus_manager.h" |
+#include "ui/base/ui_base_switches_util.h" |
+ |
namespace ui { |
MockInputMethod::MockInputMethod(internal::InputMethodDelegate* delegate) |
@@ -17,6 +20,9 @@ void MockInputMethod::SetDelegate(internal::InputMethodDelegate* delegate) { |
} |
void MockInputMethod::SetFocusedTextInputClient(TextInputClient* client) { |
+ if (switches::IsTextInputFocusManagerEnabled()) |
+ return; |
+ |
if (text_input_client_ == client) |
return; |
text_input_client_ = client; |
@@ -31,6 +37,9 @@ void MockInputMethod::DetachTextInputClient(TextInputClient* client) { |
} |
TextInputClient* MockInputMethod::GetTextInputClient() const { |
+ if (switches::IsTextInputFocusManagerEnabled()) |
+ return TextInputFocusManager::GetInstance()->GetFocusedTextInputClient(); |
+ |
return text_input_client_; |
} |