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

Unified Diff: ash/wm/immersive_fullscreen_controller_unittest.cc

Issue 270863005: Use native coordinates to warp the cursor to another display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/drag_window_resizer_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/immersive_fullscreen_controller_unittest.cc
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index ac0ac86d80dc19570e10f160862bd4be1b90a995..3ff1a10fb4bf3cf3ae770419e024b4276585069b 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -5,6 +5,7 @@
#include "ash/wm/immersive_fullscreen_controller.h"
#include "ash/display/display_manager.h"
+#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_types.h"
@@ -540,8 +541,12 @@ TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) {
// edge even though the mouse is warped to the secondary display.
event_generator.MoveMouseTo(x, y_top_edge);
EXPECT_TRUE(top_edge_hover_timer_running());
- EXPECT_NE(y_top_edge,
- aura::Env::GetInstance()->last_mouse_location().y());
+
+ // 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());
+ }
// The timer should continue running if the user overshoots the top edge
// a bit.
« no previous file with comments | « ash/wm/drag_window_resizer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698