| Index: views/widget/native_widget_gtk.cc
|
| diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
|
| index dae9c95519d401278c6ec1109b4c5bdaca1c724a..dd57b005935b97dda60c1a543fe7a9e95d125ec5 100644
|
| --- a/views/widget/native_widget_gtk.cc
|
| +++ b/views/widget/native_widget_gtk.cc
|
| @@ -961,10 +961,11 @@ bool NativeWidgetGtk::HasMouseCapture() const {
|
| }
|
|
|
| InputMethod* NativeWidgetGtk::CreateInputMethod() {
|
| - // Create input method when pure views is enabled.
|
| + // Create input method when pure views is enabled but not on views desktop.
|
| // TODO(suzhe): Always enable input method when we start to use
|
| // RenderWidgetHostViewViews in normal ChromeOS.
|
| - if (views::Widget::IsPureViews()) {
|
| + if (views::Widget::IsPureViews() &&
|
| + !ViewsDelegate::views_delegate->GetDefaultParentView()) {
|
| #if defined(HAVE_IBUS)
|
| InputMethod* input_method =
|
| InputMethodIBus::IsInputMethodIBusEnabled() ?
|
| @@ -976,7 +977,7 @@ InputMethod* NativeWidgetGtk::CreateInputMethod() {
|
| input_method->Init(GetWidget());
|
| return input_method;
|
| }
|
| - // GTK's textfield handles IME.
|
| + // GTK's textfield or InputMethod in NativeWidgetViews will handle IME.
|
| return NULL;
|
| }
|
|
|
|
|