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

Unified Diff: ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 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/system/web_notification/ash_popup_alignment_delegate_unittest.cc
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
index 3ae5f22fde3c39a6cd00b69b545b562591324af0..e4ac1a1233252c128d6871da8979d38ddf667f68 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -196,9 +196,6 @@ TEST_F(AshPopupAlignmentDelegateTest, DisplayResize) {
}
TEST_F(AshPopupAlignmentDelegateTest, DockedMode) {
- if (!SupportsMultipleDisplays())
- return;
-
const gfx::Rect toast_size(0, 0, 10, 10);
UpdateDisplay("600x600");
int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
@@ -233,8 +230,6 @@ TEST_F(AshPopupAlignmentDelegateTest, TrayHeight) {
}
TEST_F(AshPopupAlignmentDelegateTest, Extended) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("600x600,800x800");
SetAlignmentDelegate(
base::MakeUnique<AshPopupAlignmentDelegate>(GetPrimaryShelf()));
@@ -253,8 +248,6 @@ TEST_F(AshPopupAlignmentDelegateTest, Extended) {
}
TEST_F(AshPopupAlignmentDelegateTest, Unified) {
- if (!SupportsMultipleDisplays())
- return;
display_manager()->SetUnifiedDesktopEnabled(true);
// Reset the delegate as the primary display's shelf will be destroyed during
« no previous file with comments | « ash/system/toast/toast_manager_unittest.cc ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698