diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 10:27:16 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 10:27:16 +0000 |
| commit | cb3775ee87f991bea474e1dd5d4df14d92a4c06b (patch) | |
| tree | ae99132b7e1250962da1d92580dfbd122ccb9df6 /ash/wm/immersive_fullscreen_controller_unittest.cc | |
| parent | 3ee09b5f26ebb41c39bae812b455f665dc0967da (diff) | |
| download | chromium_src-cb3775ee87f991bea474e1dd5d4df14d92a4c06b.zip chromium_src-cb3775ee87f991bea474e1dd5d4df14d92a4c06b.tar.gz chromium_src-cb3775ee87f991bea474e1dd5d4df14d92a4c06b.tar.bz2 | |
Make old cursor warp mode ozone only
BUG=None
Review URL: https://codereview.chromium.org/405483005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/immersive_fullscreen_controller_unittest.cc')
| -rw-r--r-- | ash/wm/immersive_fullscreen_controller_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 96391a1..8868689 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -544,10 +544,9 @@ TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) { EXPECT_TRUE(top_edge_hover_timer_running()); // TODO(oshima): Provide a test API to handle mouse warp more easily. - if (!MouseCursorEventFilter::IsMouseWarpInNativeCoordsEnabled()) { - EXPECT_NE(y_top_edge, - aura::Env::GetInstance()->last_mouse_location().y()); - } +#if defined(USE_OZONE) + EXPECT_NE(y_top_edge, aura::Env::GetInstance()->last_mouse_location().y()); +#endif // The timer should continue running if the user overshoots the top edge // a bit. |