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

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

Issue 2926683003: Enable WidgetTestInteractive.DesktopNativeWidgetWithModalTransientChild on OS_WIN (Closed)
Patch Set: feedback Created 3 years, 6 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 | « no previous file | 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 cd58ae0ec9c4f1f1bbdecf18b4cc97a2a7ea082d..229d009c285e8318010135c06887956ad8fc20f9 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -1271,12 +1271,15 @@ TEST_F(WidgetTestInteractive, RestoreAfterMinimize) {
widget->CloseNow();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_WIN)
-// TODO(warx): Investigate the flakiness on OS_WIN (crbug.com/729331).
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Tests that when a desktop native widget has modal transient child, it should
// avoid restore focused view itself as the modal transient child window will do
// that, thus avoids having multiple focused view visually (crbug.com/727641).
TEST_F(WidgetTestInteractive, DesktopNativeWidgetWithModalTransientChild) {
+ // Create a desktop native Widget for Widget::Deactivate().
+ Widget* deactivate_widget = CreateWidget();
+ ShowSync(deactivate_widget);
+
// Create a top level desktop native widget.
Widget* top_level = CreateWidget();
@@ -1315,8 +1318,9 @@ TEST_F(WidgetTestInteractive, DesktopNativeWidgetWithModalTransientChild) {
EXPECT_FALSE(textfield->HasFocus());
top_level->CloseNow();
+ deactivate_widget->CloseNow();
}
-#endif // defined(USE_AURA) && !defined(OS_CHROMEOS) && !defined(OS_WIN)
+#endif // defined(USE_AURA) && !defined(OS_CHROMEOS)
namespace {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698