1 files changed, 13 insertions, 4 deletions
diff --git a/chromium/ui/base/ime/mock_input_method.cc b/chromium/ui/base/ime/mock_input_method.cc
index c0a5c2a1f21..5ffc76fc1dc 100644
--- a/chromium/ui/base/ime/mock_input_method.cc
+++ b/chromium/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_;
 }
 
@@ -81,10 +90,6 @@ std::string MockInputMethod::GetInputLocale() {
   return "";
 }
 
-base::i18n::TextDirection MockInputMethod::GetInputTextDirection() {
-  return base::i18n::UNKNOWN_DIRECTION;
-}
-
 bool MockInputMethod::IsActive() {
   return true;
 }
@@ -105,6 +110,10 @@ bool MockInputMethod::IsCandidatePopupOpen() const {
   return false;
 }
 
+void MockInputMethod::ShowImeIfNeeded() {
+  FOR_EACH_OBSERVER(InputMethodObserver, observer_list_, OnShowImeIfNeeded());
+}
+
 void MockInputMethod::AddObserver(InputMethodObserver* observer) {
   observer_list_.AddObserver(observer);
 }