Redesigns the text input focus handling.

ui/base/ime/input_method_base.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/ime/input_method_base.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/base/ime/text_input_focus_manager.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 
 namespace ui {
 
 InputMethodBase::InputMethodBase()
   : delegate_(NULL),
     text_input_client_(NULL),
     system_toplevel_window_focused_(false) {
 }
 
@@ skipping 26 matching lines @@
   SetFocusedTextInputClientInternal(client);
 }
 
 void InputMethodBase::DetachTextInputClient(TextInputClient* client) {
   if (text_input_client_ != client)
     return;
   SetFocusedTextInputClientInternal(NULL);
 }
 
 TextInputClient* InputMethodBase::GetTextInputClient() const {
+  if (switches::IsTextInputFocusManagerEnabled())
+    return TextInputFocusManager::GetInstance()->GetFocusedTextInputClient();
+
   return system_toplevel_window_focused_ ? text_input_client_ : NULL;
 }
 
 void InputMethodBase::OnTextInputTypeChanged(const TextInputClient* client) {
   if (!IsTextInputClientFocused(client))
     return;
   NotifyTextInputStateChanged(client);
 }
 
 TextInputType InputMethodBase::GetTextInputType() const {
@@ skipping 47 matching lines @@
 
 void InputMethodBase::NotifyTextInputStateChanged(
     const TextInputClient* client) {
   FOR_EACH_OBSERVER(InputMethodObserver,
                     observer_list_,
                     OnTextInputStateChanged(client));
 }
 
 void InputMethodBase::SetFocusedTextInputClientInternal(
     TextInputClient* client) {
+  if (switches::IsTextInputFocusManagerEnabled())
+    return;
+
   TextInputClient* old = text_input_client_;
   if (old == client)
     return;
   OnWillChangeFocusedClient(old, client);
   text_input_client_ = client;  // NULL allowed.
   OnDidChangeFocusedClient(old, client);
   NotifyTextInputStateChanged(text_input_client_);
 }
 
 void InputMethodBase::OnCandidateWindowShown() {
@@ skipping 24 matching lines @@
   if (text_input_client_)
     text_input_client_->OnCandidateWindowUpdated();
 }
 
 void InputMethodBase::CandidateWindowHiddenCallback() {
   if (text_input_client_)
     text_input_client_->OnCandidateWindowHidden();
 }
 
 }  // namespace ui