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

Unified Diff: ash/wm/workspace/workspace_window_resizer_unittest.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase 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/workspace/workspace_layout_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 1bf44f64e3cac4caa00026cdd9ef58ac8402913e..45e189a9ce28f5fd80b1797b32b907c62763ae23 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -78,11 +78,6 @@ class WorkspaceWindowResizerTest : public test::AshMDTestBase {
aura::Window* root = Shell::GetPrimaryRootWindow();
gfx::Rect root_bounds(root->bounds());
-#if defined(OS_WIN)
- // RootWindow and Display can't resize on Windows Ash.
- // http://crbug.com/165962
- EXPECT_EQ(kRootHeight, root_bounds.height());
-#endif
EXPECT_EQ(800, root_bounds.width());
Shell::GetInstance()->SetDisplayWorkAreaInsets(root, gfx::Insets());
window_.reset(new aura::Window(&delegate_));
@@ -424,7 +419,6 @@ TEST_P(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_2) {
EXPECT_EQ("0,250 200x100", window2_->bounds().ToString());
}
-#if defined(OS_CHROMEOS)
// Assertions around attached window resize dragging from the bottom with 3
// windows.
TEST_P(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {
@@ -469,7 +463,6 @@ TEST_P(WorkspaceWindowResizerTest, AttachedResize_BOTTOM_3) {
EXPECT_EQ("300,300 200x150", window2_->bounds().ToString());
EXPECT_EQ("300,450 200x100", window3_->bounds().ToString());
}
-#endif // defined(OS_CHROMEOS)
// Assertions around attached window resizing (collapsing and expanding) with
// 3 windows.
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698