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

Unified Diff: ash/shelf/shelf_view_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
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view_unittest.cc
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index 522934a3d4a5d0839640f138175114223d9a35ed..50a46afd8ce618235e4033db6275a0c8aa75421e 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -197,9 +197,6 @@ TEST_F(WmShelfObserverIconTest, AddRemove) {
// Make sure creating/deleting an window on one displays notifies a
// shelf on external display as well as one on primary.
TEST_F(WmShelfObserverIconTest, AddRemoveWithMultipleDisplays) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("400x400,400x400");
WmWindow* second_root = WmShell::Get()->GetAllRootWindows()[1];
WmShelf* second_shelf = second_root->GetRootWindowController()->GetShelf();
@@ -1683,10 +1680,6 @@ TEST_F(ShelfViewTest, CheckDragInsertBoundsOfScrolledOverflowBubble) {
// Check the drag insertion bounds of shelf view in multi monitor environment.
TEST_F(ShelfViewTest, CheckDragInsertBoundsWithMultiMonitor) {
- // win8-aura doesn't support multiple display.
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("800x600,800x600");
WmShelf* secondary_shelf =
WmShelf::ForWindow(WmShell::Get()->GetAllRootWindows()[1]);
@@ -1751,10 +1744,6 @@ TEST_F(ShelfViewTest, CheckDragInsertBoundsWithMultiMonitor) {
// Checks the rip an item off from left aligned shelf in secondary monitor.
TEST_F(ShelfViewTest, CheckRipOffFromLeftShelfAlignmentWithMultiMonitor) {
- // win8-aura doesn't support multiple display.
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("800x600,800x600");
ASSERT_EQ(2U, WmShell::Get()->GetAllRootWindows().size());
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698