| Index: ui/views/widget/widget.cc
|
| ===================================================================
|
| --- ui/views/widget/widget.cc (revision 152769)
|
| +++ ui/views/widget/widget.cc (working copy)
|
| @@ -658,8 +658,11 @@
|
|
|
| InputMethod* Widget::GetInputMethod() {
|
| if (is_top_level()) {
|
| - if (!input_method_.get())
|
| + if (!input_method_.get()) {
|
| input_method_.reset(native_widget_->CreateInputMethod());
|
| + if (input_method_.get())
|
| + input_method_->Init(this);
|
| + }
|
| return input_method_.get();
|
| } else {
|
| Widget* toplevel = GetTopLevelWidget();
|
| @@ -1320,7 +1323,7 @@
|
|
|
| void Widget::ReplaceInputMethod(InputMethod* input_method) {
|
| input_method_.reset(input_method);
|
| - input_method->set_delegate(native_widget_);
|
| + input_method->set_delegate(native_widget_->GetInputMethodDelegate());
|
| input_method->Init(this);
|
| }
|
|
|
|
|