| Index: ui/views/widget/native_widget_aura.cc
|
| diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
|
| index cf3017b252b72e09eac3676ad760f9bf6acb4465..6c53b2d8118220e92dc19f10a78253d7c9c31ad7 100644
|
| --- a/ui/views/widget/native_widget_aura.cc
|
| +++ b/ui/views/widget/native_widget_aura.cc
|
| @@ -18,7 +18,6 @@
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/aura/window_tree_host.h"
|
| #include "ui/base/dragdrop/os_exchange_data.h"
|
| -#include "ui/base/ui_base_switches_util.h"
|
| #include "ui/base/ui_base_types.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/events/event.h"
|
| @@ -271,9 +270,6 @@ InputMethod* NativeWidgetAura::CreateInputMethod() {
|
| if (!window_)
|
| return NULL;
|
|
|
| - if (switches::IsTextInputFocusManagerEnabled())
|
| - return new NullInputMethod();
|
| -
|
| return new InputMethodBridge(this, GetHostInputMethod(), true);
|
| }
|
|
|
| @@ -889,12 +885,6 @@ void NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
|
| if (!input_method)
|
| return;
|
| input_method->DispatchKeyEvent(*event);
|
| - if (switches::IsTextInputFocusManagerEnabled()) {
|
| - FocusManager* focus_manager = GetWidget()->GetFocusManager();
|
| - delegate_->OnKeyEvent(event);
|
| - if (!event->handled() && focus_manager)
|
| - focus_manager->OnKeyEvent(*event);
|
| - }
|
| event->SetHandled();
|
| }
|
|
|
|
|