Index: ui/views/widget/widget.cc |
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc |
index cfc6d59a39348753ceeb4e485781d13e0503c071..2e0007048cd2e620bc91819645e970729b3c8de9 100644 |
--- a/ui/views/widget/widget.cc |
+++ b/ui/views/widget/widget.cc |
@@ -789,6 +789,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, |
@@ -1030,11 +1034,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); |
} |