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

Unified Diff: ash/wm/window_manager_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/toplevel_window_event_handler_unittest.cc ('k') | ash/wm/window_positioner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index bd3627f78646c8a1e4dcdc233fda4da452a1651b..79b1a2be1c35e328f26bbd781f01012b63f88d93 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -567,12 +567,7 @@ TEST_F(WindowManagerTest, MouseEventCursors) {
}
}
-#if defined(OS_WIN)
-#define MAYBE_TransformActivate DISABLED_TransformActivate
-#else
-#define MAYBE_TransformActivate TransformActivate
-#endif
-TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
+TEST_F(WindowManagerTest, TransformActivate) {
aura::Window* root_window = Shell::GetPrimaryRootWindow();
gfx::Size size = root_window->bounds().size();
EXPECT_EQ(gfx::Rect(size).ToString(),
@@ -699,8 +694,7 @@ TEST_F(WindowManagerTest, AdditionalFilters) {
env_filter->RemoveHandler(f2.get());
}
-#if defined(OS_CHROMEOS) || defined(OS_WIN)
-// Touch visually hides the cursor on ChromeOS and Windows
+// Touch visually hides the cursor.
TEST_F(WindowManagerTest, UpdateCursorVisibility) {
ui::test::EventGenerator& generator = GetEventGenerator();
::wm::CursorManager* cursor_manager =
@@ -719,11 +713,8 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) {
EXPECT_TRUE(cursor_manager->IsCursorVisible());
EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
}
-#endif // defined(OS_CHROMEOS) || defined(OS_WIN)
-#if defined(OS_CHROMEOS)
-// ChromeOS is the only platform for which the cursor is hidden on keypress
-// (crbug.com/304296).
+// Cursor is hidden on keypress.
TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) {
ui::test::EventGenerator& generator = GetEventGenerator();
::wm::CursorManager* cursor_manager =
@@ -843,6 +834,5 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
cursor_manager->RemoveObserver(&observer_a);
}
-#endif // defined(OS_CHROMEOS)
} // namespace ash
« no previous file with comments | « ash/wm/toplevel_window_event_handler_unittest.cc ('k') | ash/wm/window_positioner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698