| Index: ui/views/widget/widget.cc
|
| diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
|
| index 2bc65f079e388de2d550154a4f2912de0a7f4ee2..8af7ed37ee59f7fa3c5650e42272849c638dc828 100644
|
| --- a/ui/views/widget/widget.cc
|
| +++ b/ui/views/widget/widget.cc
|
| @@ -788,6 +788,10 @@ const InputMethod* Widget::GetInputMethod() const {
|
| }
|
| }
|
|
|
| +ui::InputMethod* Widget::GetHostInputMethod() {
|
| + return native_widget_private()->GetHostInputMethod();
|
| +}
|
| +
|
| void Widget::RunShellDrag(View* view,
|
| const ui::OSExchangeData& data,
|
| const gfx::Point& location,
|
| @@ -1029,11 +1033,19 @@ void Widget::OnNativeWidgetActivationChanged(bool active) {
|
| }
|
|
|
| void Widget::OnNativeFocus(gfx::NativeView old_focused_view) {
|
| + // Ensure the focused view's TextInputClient is used for text input.
|
| + views::FocusManager* focus_manager = GetFocusManager();
|
| + focus_manager->FocusTextInputClient(focus_manager->GetFocusedView());
|
| +
|
| WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(old_focused_view,
|
| GetNativeView());
|
| }
|
|
|
| void Widget::OnNativeBlur(gfx::NativeView new_focused_view) {
|
| + // Ensure the focused view's TextInputClient is not used for text input.
|
| + views::FocusManager* focus_manager = GetFocusManager();
|
| + focus_manager->BlurTextInputClient(focus_manager->GetFocusedView());
|
| +
|
| WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(GetNativeView(),
|
| new_focused_view);
|
| }
|
|
|