| Index: ui/views/mus/native_widget_mus.cc
|
| diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
|
| index dd79ff864b3943e2b20d9400af864fe9aab175ba..e1fbfbb6ba41986f4d466af1eae58703ceead76c 100644
|
| --- a/ui/views/mus/native_widget_mus.cc
|
| +++ b/ui/views/mus/native_widget_mus.cc
|
| @@ -32,6 +32,7 @@
|
| #include "ui/gfx/path.h"
|
| #include "ui/native_theme/native_theme_aura.h"
|
| #include "ui/platform_window/platform_window_delegate.h"
|
| +#include "ui/views/mus/window_manager_connection.h"
|
| #include "ui/views/mus/window_manager_constants_converters.h"
|
| #include "ui/views/mus/window_manager_frame_values.h"
|
| #include "ui/views/mus/window_tree_host_mus.h"
|
| @@ -687,6 +688,13 @@ void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) {
|
| window_tree_host_->InitHost();
|
| hosted_window->SetProperty(kMusWindow, window_);
|
|
|
| + // TODO(moshayedi): crbug.com/641039. Investigate whether there are any cases
|
| + // where we need input method but don't have the WindowManagerConnection here.
|
| + if (WindowManagerConnection::Exists()) {
|
| + window_tree_host_->InitInputMethod(
|
| + WindowManagerConnection::Get()->connector());
|
| + }
|
| +
|
| focus_client_.reset(
|
| new FocusControllerMus(new FocusRulesImpl(hosted_window)));
|
|
|
|
|