| Index: ash/test/ash_test_helper.cc
|
| diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
|
| index 131816e66fae129dcaef98f049e70aa377d668a4..35138448cd542bbb04855ba6ddfd924da2750b65 100644
|
| --- a/ash/test/ash_test_helper.cc
|
| +++ b/ash/test/ash_test_helper.cc
|
| @@ -34,6 +34,7 @@
|
| #include "ui/wm/core/cursor_manager.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| +#include "ash/system/chromeos/screen_layout_observer.h"
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
| @@ -137,6 +138,12 @@ void AshTestHelper::SetUp(bool start_session,
|
| GetTestSessionStateDelegate()->SetHasActiveUser(true);
|
| }
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // Tests that change the display configuration generally don't care about the
|
| + // notifications and the popup UI can interfere with things like cursors.
|
| + shell->screen_layout_observer()->set_show_notifications_for_testing(false);
|
| +#endif
|
| +
|
| test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
|
| .DisableChangeDisplayUponHostResize();
|
| ShellTestApi(shell).DisableDisplayAnimator();
|
|
|