Fix moving the mouse between two displays after the secondary display becomes primary.

ash/display/extended_mouse_warp_controller.h

Index: ash/display/extended_mouse_warp_controller.h
diff --git a/ash/display/extended_mouse_warp_controller.h b/ash/display/extended_mouse_warp_controller.h
index d1502064f7b99b9cf7f13eb45c9f1fef864b66cf..0ddc2d07134ee5ed0e77ef3c3ae699700d28112e 100644
--- a/ash/display/extended_mouse_warp_controller.h
+++ b/ash/display/extended_mouse_warp_controller.h
@@ -52,7 +52,7 @@ class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
                            IndicatorBoundsTestThreeDisplays);
 
   // Defined in header file because tests need access.
-  struct WarpRegion {
+  class WarpRegion {
    public:
     WarpRegion(int64_t a_display_id,
                int64_t b_display_id,
@@ -87,8 +87,8 @@ class ASH_EXPORT ExtendedMouseWarpController : public MouseWarpController {
   std::vector<scoped_ptr<WarpRegion>> warp_regions_;
 
   // Registers the WarpRegion; also displays a drag indicator on the screen if
-  // |drag_source| is true.
-  void AddWarpRegion(scoped_ptr<WarpRegion> region, bool drag_source);
+  // |has_drag_source| is true.
+  void AddWarpRegion(scoped_ptr<WarpRegion> region, bool has_drag_source);
 
   // Warps the mouse cursor to an alternate root window when the
   // mouse location in |event|, hits the edge of the event target's root and