| Index: ui/views/mus/window_tree_host_mus.cc
|
| diff --git a/ui/views/mus/window_tree_host_mus.cc b/ui/views/mus/window_tree_host_mus.cc
|
| index 4af43f29ea113d625e0f118c2ef79200084fd778..0d08e1b3f41fc1ad4ee81980577e1e255d440d8c 100644
|
| --- a/ui/views/mus/window_tree_host_mus.cc
|
| +++ b/ui/views/mus/window_tree_host_mus.cc
|
| @@ -59,9 +59,6 @@ WindowTreeHostMus::WindowTreeHostMus(NativeWidgetMus* native_widget,
|
| platform_window()->SetBounds(window->bounds());
|
|
|
| compositor()->SetHostHasTransparentBackground(true);
|
| -
|
| - input_method_ = base::MakeUnique<InputMethodMus>(this, window);
|
| - SetSharedInputMethod(input_method_.get());
|
| }
|
|
|
| WindowTreeHostMus::~WindowTreeHostMus() {
|
| @@ -69,15 +66,9 @@ WindowTreeHostMus::~WindowTreeHostMus() {
|
| DestroyDispatcher();
|
| }
|
|
|
| -void WindowTreeHostMus::InitInputMethod(service_manager::Connector* connector) {
|
| - input_method_->Init(connector);
|
| -}
|
| -
|
| void WindowTreeHostMus::DispatchEvent(ui::Event* event) {
|
| - if (event->IsKeyEvent() && GetInputMethod()) {
|
| - GetInputMethod()->DispatchKeyEvent(event->AsKeyEvent());
|
| - return;
|
| - }
|
| + // Key events are sent to InputMethodMus directly from NativeWidgetMus.
|
| + DCHECK(!event->IsKeyEvent());
|
| WindowTreeHostPlatform::DispatchEvent(event);
|
| }
|
|
|
|
|