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

Unified Diff: ash/wm/workspace/workspace_layout_manager_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/wm/window_util_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index f7e23e41bfa7a1fab3f9984a31fc9b355860f622..426e7bcc2ba4c40a677f01beee82d9997f6daaaf 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -118,9 +118,6 @@ TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
EXPECT_EQ("0,0 100x100", window_state->GetRestoreBoundsInScreen().ToString());
EXPECT_EQ("10,15 25x35", window->GetBounds().ToString());
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("400x300,500x400");
window->SetBoundsInScreen(gfx::Rect(600, 0, 100, 100), GetSecondaryDisplay());
EXPECT_EQ(WmShell::Get()->GetAllRootWindows()[1], window->GetRootWindow());
@@ -141,9 +138,6 @@ TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
}
TEST_F(WorkspaceLayoutManagerTest, KeepMinimumVisibilityInDisplays) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("300x400,400x500");
WmWindow::Windows root_windows = WmShell::Get()->GetAllRootWindows();
@@ -219,8 +213,6 @@ TEST_F(WorkspaceLayoutManagerTest, KeepRestoredWindowInDisplay) {
}
TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("300x400,400x500");
WmWindow::Windows root_windows = WmShell::Get()->GetAllRootWindows();
@@ -281,8 +273,6 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {
}
TEST_F(WorkspaceLayoutManagerTest, FullscreenInDisplayToBeRestored) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("300x400,400x500");
WmWindow::Windows root_windows = WmShell::Get()->GetAllRootWindows();
« no previous file with comments | « ash/wm/window_util_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698