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

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

Issue 2689143002: ash: Remove OS_CHROMEOS ifdefs from accelerator files (Closed)
Patch Set: rebase Created 3 years, 10 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/mus/accelerators/accelerator_controller_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 fd7d30b17e197cddb8bbdbc44a65501691b44de8..ea8d4bb4f6dc536f30194df306ff3c05a3edbf06 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -1627,7 +1627,6 @@ TEST_P(WorkspaceWindowResizerTest, DontExceedMaxHeight) {
EXPECT_EQ("100,350 100x150", window4_->bounds().ToString());
}
-#if defined(OS_CHROMEOS)
TEST_P(WorkspaceWindowResizerTest, DontExceedMinHeight) {
UpdateDisplay("600x500");
aura::Window* root = Shell::GetPrimaryRootWindow();
@@ -1656,7 +1655,6 @@ TEST_P(WorkspaceWindowResizerTest, DontExceedMinHeight) {
EXPECT_EQ("100,351 100x99", window3_->bounds().ToString());
EXPECT_EQ("100,450 100x50", window4_->bounds().ToString());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(WorkspaceWindowResizerTest, DontExpandRightmostPastMaxWidth) {
UpdateDisplay("600x800");
@@ -1711,7 +1709,6 @@ TEST_P(WorkspaceWindowResizerTest, MoveAttachedWhenGrownToMaxSize) {
EXPECT_EQ("249,100 101x100", window3_->bounds().ToString());
}
-#if defined(OS_CHROMEOS)
TEST_P(WorkspaceWindowResizerTest, MainWindowHonoursMaxWidth) {
UpdateDisplay("400x800");
aura::Window* root = Shell::GetPrimaryRootWindow();
@@ -1738,7 +1735,6 @@ TEST_P(WorkspaceWindowResizerTest, MainWindowHonoursMaxWidth) {
EXPECT_EQ("202,100 99x100", window2_->bounds().ToString());
EXPECT_EQ("301,100 99x100", window3_->bounds().ToString());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(WorkspaceWindowResizerTest, MainWindowHonoursMinWidth) {
UpdateDisplay("400x800");
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698