Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1807)

Unified Diff: ui/views/widget/widget.cc

Issue 173803002: Redesigns the text input focus handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/widget.h ('k') | ui/wm/core/focus_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index ed07ae2f0c8d00120f266e57163f5a3d7152298d..7464bfa87854772029cf2fbed5e73528290555e4 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);
}
« no previous file with comments | « ui/views/widget/widget.h ('k') | ui/wm/core/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698