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

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

Issue 2371113003: Do not give instant focus if a view's toplevelwidget is not active (Closed)
Patch Set: based on sky's comments Created 4 years, 2 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
« chrome/test/BUILD.gn ('K') | « ui/views/widget/root_view_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_interactive_uitest.cc
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 141220c5fb59ca6d1b53a46dc32c4c8b24d056b1..8d73c42f1d6fffe482f84a503fb5f41e9f4d0b99 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -1698,9 +1698,8 @@ TEST_F(WidgetInputMethodInteractiveTest, Activation) {
Widget* widget = CreateWidget();
Textfield* textfield = new Textfield;
widget->GetRootView()->AddChildView(textfield);
- textfield->RequestFocus();
-
ShowSync(widget);
+ textfield->RequestFocus();
EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
widget->GetInputMethod()->GetTextInputType());
@@ -1745,7 +1744,11 @@ TEST_F(WidgetInputMethodInteractiveTest, OneWindow) {
DeactivateSync(widget);
textfield1->RequestFocus();
+#if defined(OS_MACOSX)
+ // TODO(warx): WidgetActivationWaiter has a check in ctor.
+ // Remove ActivateSync(widget) once crbug.com/650859 is fixed.
ActivateSync(widget);
+#endif
EXPECT_TRUE(widget->IsActive());
EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
widget->GetInputMethod()->GetTextInputType());
« chrome/test/BUILD.gn ('K') | « ui/views/widget/root_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698