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

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

Issue 294023002: aura: Updates the text input client when native activation changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed sky's comments. 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
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 73ecd43d6cdf48338c85451ec3c9d6b9a534cb39..5272f98fc22679798b2776474a7c6b469d5d5461 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -1031,6 +1031,19 @@ void Widget::OnNativeWidgetActivationChanged(bool active) {
FOR_EACH_OBSERVER(WidgetObserver, observers_,
OnWidgetActivationChanged(this, active));
+ // During window creation, the widget gets focused without activation, and in
+ // that case, the focus manager cannot set the appropriate text input client
+ // because the widget is not active. Thus we have to notify the focus manager
+ // not only when the focus changes but also when the widget gets activated.
+ // See crbug.com/377479 for details.
+ views::FocusManager* focus_manager = GetFocusManager();
+ if (focus_manager) {
+ if (active)
+ focus_manager->FocusTextInputClient(focus_manager->GetFocusedView());
+ else
+ focus_manager->BlurTextInputClient(focus_manager->GetFocusedView());
+ }
+
if (IsVisible() && non_client_view())
non_client_view()->frame_view()->SchedulePaint();
}
« ui/views/focus/focus_manager_unittest.cc ('K') | « ui/views/focus/focus_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698