| Index: ui/base/ime/input_method_base.cc
|
| diff --git a/ui/base/ime/input_method_base.cc b/ui/base/ime/input_method_base.cc
|
| index b117a08d4d8fc0cb9687bf84cfc74b0d81cfdd73..dc856198b0ca3bc873b870fc677cf049360b9763 100644
|
| --- a/ui/base/ime/input_method_base.cc
|
| +++ b/ui/base/ime/input_method_base.cc
|
| @@ -10,8 +10,6 @@
|
| #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 {
|
| @@ -51,9 +49,6 @@ void InputMethodBase::DetachTextInputClient(TextInputClient* client) {
|
| }
|
|
|
| TextInputClient* InputMethodBase::GetTextInputClient() const {
|
| - if (switches::IsTextInputFocusManagerEnabled())
|
| - return TextInputFocusManager::GetInstance()->GetFocusedTextInputClient();
|
| -
|
| return system_toplevel_window_focused_ ? text_input_client_ : NULL;
|
| }
|
|
|
| @@ -132,9 +127,6 @@ void InputMethodBase::NotifyTextInputCaretBoundsChanged(
|
|
|
| void InputMethodBase::SetFocusedTextInputClientInternal(
|
| TextInputClient* client) {
|
| - if (switches::IsTextInputFocusManagerEnabled())
|
| - return;
|
| -
|
| TextInputClient* old = text_input_client_;
|
| if (old == client)
|
| return;
|
|
|