| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 ASSERT_FALSE(details.dispatcher_destroyed); | 590 ASSERT_FALSE(details.dispatcher_destroyed); |
| 591 EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED)); | 591 EXPECT_EQ(0, widget_view->GetEventCount(ui::ET_MOUSE_MOVED)); |
| 592 | 592 |
| 593 modal_dialog_widget->CloseNow(); | 593 modal_dialog_widget->CloseNow(); |
| 594 top_level_widget.CloseNow(); | 594 top_level_widget.CloseNow(); |
| 595 } | 595 } |
| 596 | 596 |
| 597 #if defined(OS_WIN) | 597 #if defined(OS_WIN) |
| 598 // Tests whether we can activate the top level widget when a modal dialog is | 598 // Tests whether we can activate the top level widget when a modal dialog is |
| 599 // active. | 599 // active. |
| 600 TEST_F(WidgetTest, WindowModalityActivationTest) { | 600 // Flaky: crbug.com/613428 |
| 601 TEST_F(WidgetTest, DISABLED_WindowModalityActivationTest) { |
| 601 TestDesktopWidgetDelegate widget_delegate; | 602 TestDesktopWidgetDelegate widget_delegate; |
| 602 widget_delegate.InitWidget(CreateParams(Widget::InitParams::TYPE_WINDOW)); | 603 widget_delegate.InitWidget(CreateParams(Widget::InitParams::TYPE_WINDOW)); |
| 603 | 604 |
| 604 Widget* top_level_widget = widget_delegate.GetWidget(); | 605 Widget* top_level_widget = widget_delegate.GetWidget(); |
| 605 top_level_widget->Show(); | 606 top_level_widget->Show(); |
| 606 EXPECT_TRUE(top_level_widget->IsVisible()); | 607 EXPECT_TRUE(top_level_widget->IsVisible()); |
| 607 | 608 |
| 608 HWND win32_window = views::HWNDForWidget(top_level_widget); | 609 HWND win32_window = views::HWNDForWidget(top_level_widget); |
| 609 EXPECT_TRUE(::IsWindow(win32_window)); | 610 EXPECT_TRUE(::IsWindow(win32_window)); |
| 610 | 611 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 target->HandleKeyboardMessage(WM_CHAR, 0, 0, &handled); | 654 target->HandleKeyboardMessage(WM_CHAR, 0, 0, &handled); |
| 654 target->HandleKeyboardMessage(WM_SYSCHAR, 0, 0, &handled); | 655 target->HandleKeyboardMessage(WM_SYSCHAR, 0, 0, &handled); |
| 655 target->HandleKeyboardMessage(WM_SYSDEADCHAR, 0, 0, &handled); | 656 target->HandleKeyboardMessage(WM_SYSDEADCHAR, 0, 0, &handled); |
| 656 widget.CloseNow(); | 657 widget.CloseNow(); |
| 657 } | 658 } |
| 658 | 659 |
| 659 #endif // defined(OS_WIN) | 660 #endif // defined(OS_WIN) |
| 660 | 661 |
| 661 } // namespace test | 662 } // namespace test |
| 662 } // namespace views | 663 } // namespace views |
| OLD | NEW |