Commit 6c890d93 authored by Mike Wasserman's avatar Mike Wasserman Committed by Commit Bot

Remove deprecated OS_WIN checks in src/ash

Ash is no longer built on Windows.
Also cleanup DragDropControllerTest.

Bug: NONE
Change-Id: I73b3ce606aca98abc6248f7cf8356c6307a785b6
Reviewed-on: https://chromium-review.googlesource.com/723866Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509543}
parent 4bb86111
...@@ -114,8 +114,6 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) { ...@@ -114,8 +114,6 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
EXPECT_EQ(50, cursor_bounds.y() + hot_point.y()); EXPECT_EQ(50, cursor_bounds.y() + hot_point.y());
} }
// Windows doesn't support compositor based cursor.
#if !defined(OS_WIN)
// Make sure that composition cursor inherits the visibility state. // Make sure that composition cursor inherits the visibility state.
TEST_F(CursorWindowControllerTest, VisibilityTest) { TEST_F(CursorWindowControllerTest, VisibilityTest) {
ASSERT_TRUE(GetCursorWindow()); ASSERT_TRUE(GetCursorWindow());
...@@ -169,6 +167,5 @@ TEST_F(CursorWindowControllerTest, DSF) { ...@@ -169,6 +167,5 @@ TEST_F(CursorWindowControllerTest, DSF) {
display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()); display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f)); EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f));
} }
#endif
} // namespace ash } // namespace ash
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment