| 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 9a2381bdeb06e188ece0cd3ade7a1e5169804fab..03f43d5ec2cd3c39c835ba2689b6c2256cfbfc25 100644
|
| --- a/ui/views/widget/widget_interactive_uitest.cc
|
| +++ b/ui/views/widget/widget_interactive_uitest.cc
|
| @@ -722,9 +722,18 @@ class ModalDialogDelegate : public DialogDelegateView {
|
| DISALLOW_COPY_AND_ASSIGN(ModalDialogDelegate);
|
| };
|
|
|
| +// TODO(tapted): Implement modal widgets for Mac.
|
| +#if defined(OS_MACOSX) && !defined(USE_AURA)
|
| +#define MAYBE_WindowModalWindowDestroyedActivationTest \
|
| + DISABLED_WindowModalWindowDestroyedActivationTest
|
| +#else
|
| +#define MAYBE_WindowModalWindowDestroyedActivationTest \
|
| + WindowModalWindowDestroyedActivationTest
|
| +#endif
|
| +
|
| // Tests whether the focused window is set correctly when a modal window is
|
| // created and destroyed. When it is destroyed it should focus the owner window.
|
| -TEST_F(WidgetTestInteractive, WindowModalWindowDestroyedActivationTest) {
|
| +TEST_F(WidgetTestInteractive, MAYBE_WindowModalWindowDestroyedActivationTest) {
|
| TestWidgetFocusChangeListener focus_listener;
|
| WidgetFocusManager::GetInstance()->AddFocusChangeListener(&focus_listener);
|
| const std::vector<NativeViewPair>& focus_changes =
|
| @@ -777,8 +786,19 @@ TEST_F(WidgetTestInteractive, WindowModalWindowDestroyedActivationTest) {
|
| WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(&focus_listener);
|
| }
|
|
|
| +// Disabled on Mac. Desktop Mac doesn't have system modal widgets since Carbon
|
| +// was deprecated. TODO(tapted): Implement modal windows and try out AppKit's
|
| +// application modal windows here if needed.
|
| +#if defined(OS_MACOSX) && !defined(USE_AURA)
|
| +#define MAYBE_SystemModalWindowReleasesCapture \
|
| + DISABLED_SystemModalWindowReleasesCapture
|
| +#else
|
| +#define MAYBE_SystemModalWindowReleasesCapture \
|
| + SystemModalWindowReleasesCapture
|
| +#endif
|
| +
|
| // Test that when opening a system-modal window, capture is released.
|
| -TEST_F(WidgetTestInteractive, SystemModalWindowReleasesCapture) {
|
| +TEST_F(WidgetTestInteractive, MAYBE_SystemModalWindowReleasesCapture) {
|
| TestWidgetFocusChangeListener focus_listener;
|
| WidgetFocusManager::GetInstance()->AddFocusChangeListener(&focus_listener);
|
|
|
|
|