| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| index dcbd24cb0d2f553748144c365040f854dd8f764a..2ee635121be64f53667c48acb21e89289a5d602d 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
|
| @@ -16,7 +16,6 @@
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/ime/input_method.h"
|
| -#include "ui/base/ui_base_switches_util.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/display.h"
|
| @@ -629,9 +628,6 @@ bool DesktopNativeWidgetAura::HasCapture() const {
|
| }
|
|
|
| InputMethod* DesktopNativeWidgetAura::CreateInputMethod() {
|
| - if (switches::IsTextInputFocusManagerEnabled())
|
| - return new NullInputMethod();
|
| -
|
| return new InputMethodBridge(this, GetHostInputMethod(), false);
|
| }
|
|
|
|
|