Partial revert of r223054: Abandon sticky focus mechanism

r223054 introduced sticky focus mechanism as a tentative
workaround so that TSF backend can work well under Aura
event model until IME focus handling is completely fixed.
However, TSF backend has been disabled even in immersive
(metro) mode since r223589.

This CL abandons sticky focus mechanism to simplify the code.

BUG=290701

Review URL: https://codereview.chromium.org/48163003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231732 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 14 deletions

diff --git a/ui/base/ime/mock_input_method.cc b/ui/base/ime/mock_input_method.cc
index c5fa4e2..48b2ca0 100644
--- a/ui/base/ime/mock_input_method.cc
+++ b/ui/base/ime/mock_input_method.cc
@@ -7,8 +7,7 @@
 namespace ui {
 
 MockInputMethod::MockInputMethod(internal::InputMethodDelegate* delegate)
-    : text_input_client_(NULL),
-      is_sticky_text_input_client_(false) {
+    : text_input_client_(NULL) {
 }
 
 MockInputMethod::~MockInputMethod() {
@@ -18,17 +17,6 @@ void MockInputMethod::SetDelegate(internal::InputMethodDelegate* delegate) {
 }
 
 void MockInputMethod::SetFocusedTextInputClient(TextInputClient* client) {
-  if (is_sticky_text_input_client_)
-    return;
-  if (text_input_client_ == client)
-    return;
-  text_input_client_ = client;
-  if (client)
-    OnTextInputTypeChanged(client);
-}
-
-void MockInputMethod::SetStickyFocusedTextInputClient(TextInputClient* client) {
-  is_sticky_text_input_client_ = (client != NULL);
   if (text_input_client_ == client)
     return;
   text_input_client_ = client;
@@ -39,7 +27,6 @@ void MockInputMethod::SetStickyFocusedTextInputClient(TextInputClient* client) {
 void MockInputMethod::DetachTextInputClient(TextInputClient* client) {
   if (text_input_client_ == client) {
     text_input_client_ = NULL;
-    is_sticky_text_input_client_ = false;
   }
 }