Allow the cursor to warp even when a window is dragged

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 7a151fbfe1a0c12f72c40805f5a06e2265ef1512..c85dd6e4aa328adf6a197d1b20649b0c9fdba5d1 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -68,13 +68,18 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver {
   }
   void SetSecondaryDisplayLayout(SecondaryDisplayLayout layout);
 
+  void set_allow_warp_during_lock(bool allow_warp_during_lock) {
+    allow_warp_during_lock_ = allow_warp_during_lock;
+  }
+
   // Warps the mouse cursor to an alternate root window when the
   // |point_in_root|, which is the location of the mouse cursor,
   // hits or exceeds the edge of the |root_window| and the mouse cursor
   // is considered to be in an alternate display. Returns true if
   // the cursor was moved.
   bool WarpMouseCursorIfNecessary(aura::RootWindow* root_window,
-                                  const gfx::Point& point_in_root);
+                                  const gfx::Point& point_in_root,
+                                  bool is_cursor_locked);
 
   // aura::DisplayObserver overrides:
   virtual void OnDisplayBoundsChanged(
@@ -96,6 +101,9 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver {
 
   SecondaryDisplayLayout secondary_display_layout_;
 
+  // If true, the cursor can warp even when it's locked.
+  bool allow_warp_during_lock_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };