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

Unified Diff: ash/wm/window_positioner_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/window_manager_unittest.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_positioner_unittest.cc
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc
index 82432ebefe070dacb06342f9a8e410e39f34ab2c..72ba0f234d357f5862e93fe9a87b10625def3c7e 100644
--- a/ash/wm/window_positioner_unittest.cc
+++ b/ash/wm/window_positioner_unittest.cc
@@ -53,9 +53,7 @@ TEST_P(WindowPositionerTest, OpenMaximizedWindowOnSecondDisplay) {
TEST_P(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
if (!SupportsMultipleDisplays())
return;
-#if defined(OS_WIN)
- ash::WindowPositioner::SetMaximizeFirstWindow(true);
-#endif
+
UpdateDisplay("400x400,1400x900");
WmWindow* second_root_window = WmShell::Get()->GetAllRootWindows()[1];
ScopedRootWindowForNewWindows root_for_new_windows(second_root_window);
@@ -64,21 +62,15 @@ TEST_P(WindowPositionerTest, OpenDefaultWindowOnSecondDisplay) {
params.can_maximize = true;
views::Widget* widget = shell::ToplevelWindow::CreateToplevelWindow(params);
gfx::Rect bounds = widget->GetWindowBoundsInScreen();
-#if defined(OS_WIN)
- EXPECT_TRUE(widget->IsMaximized());
-#else
+
// The window should be in the 2nd display with the default size.
EXPECT_EQ("300x300", bounds.size().ToString());
-#endif
-
EXPECT_TRUE(
second_root_window->GetDisplayNearestWindow().bounds().Contains(bounds));
}
// Tests that second window inherits first window's maximized state as well as
// its restore bounds.
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
const int height_offset = GetMdMaximizedWindowHeightOffset();
UpdateDisplay("1400x900");
@@ -113,7 +105,6 @@ TEST_P(WindowPositionerTest, SecondMaximizedWindowHasProperRestoreSize) {
bounds = widget2->GetWindowBoundsInScreen();
EXPECT_EQ("300x300", bounds.size().ToString());
}
-#endif // defined(OS_CHROMEOS)
namespace {
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698