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

Unified Diff: ash/test/ash_test_helper.cc

Issue 2400553002: ash: Remove broken display notification suppression when settings is open (Closed)
Patch Set: fix comment Created 4 years, 2 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
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();
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | chrome/browser/ui/ash/system_tray_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698