diff options
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index e3be65d..eb4d608 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -166,10 +166,17 @@ TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) { EXPECT_TRUE(do2.destroyed()); } +// Fails on Mac only. Needs to be implemented. http://crbug.com/111279. +#if defined(OS_MACOSX) +#define MAYBE_CanActivateAfterEndModalSession \ + DISABLED_CanActivateAfterEndModalSession +#else +#define MAYBE_CanActivateAfterEndModalSession CanActivateAfterEndModalSession +#endif // Tests that we can activate an unrelated window after a modal window is closed // for a window. TEST_F(SystemModalContainerLayoutManagerTest, - CanActivateAfterEndModalSession) { + MAYBE_CanActivateAfterEndModalSession) { scoped_ptr<aura::Window> unrelated(TestWindow::OpenTestWindow(NULL, false)); unrelated->SetBounds(gfx::Rect(100, 100, 50, 50)); scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false)); |