Allow moving cursors between connected displays.

ash/display/extended_mouse_warp_controller.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 #define ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H
 
 #include "ash/display/mouse_warp_controller.h"
 
 #include <vector>
@@ skipping 24 matching lines @@
  public:
   explicit ExtendedMouseWarpController(aura::Window* drag_source);
   ~ExtendedMouseWarpController() override;
 
   // MouseWarpController:
   bool WarpMouseCursor(ui::MouseEvent* event) override;
   void SetEnabled(bool enable) override;
 
  private:
   friend class test::DisplayManagerTestApi;
-  FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
-                           IndicatorBoundsTestOnRight);
-  FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
-                           IndicatorBoundsTestOnLeft);
-  FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
-                           IndicatorBoundsTestOnTopBottom);
+  friend class ExtendedMouseWarpControllerTest;
   FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
                            IndicatorBoundsTestThreeDisplays);
+  FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
+                           IndicatorBoundsTestThreeDisplaysWithLayout);
+  FRIEND_TEST_ALL_PREFIXES(ExtendedMouseWarpControllerTest,
+                           IndicatorBoundsTestThreeDisplaysWithLayout2);
 
   // Defined in header file because tests need access.
-  class WarpRegion {
+  class ASH_EXPORT WarpRegion {
    public:
     WarpRegion(int64_t a_display_id,
                int64_t b_display_id,
                const gfx::Rect& a_indicator_bounds,
                const gfx::Rect& b_indicator_bounds);
     ~WarpRegion();
 
     const gfx::Rect& a_indicator_bounds() { return a_indicator_bounds_; }
     const gfx::Rect& b_indicator_bounds() { return b_indicator_bounds_; }
 
+    const gfx::Rect& GetIndicatorBoundsForTest(int64_t id) const;
+
    private:
     friend class ExtendedMouseWarpController;
 
     // If the mouse cursor is in |a_edge_bounds_in_native|, then it will be
     // moved to |b_display_id|. Similarily, if the cursor is in
     // |b_edge_bounds_in_native|, then it will be moved to |a_display_id|.
 
     // The id for the displays. Used for warping the cursor.
     int64_t a_display_id_;
     int64_t b_display_id_;
@@ skipping 21 matching lines @@
 
   // 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
   // the mouse cursor is considered to be in an alternate display.
   // If |update_mouse_location_now| is true,
   // Returns true if/ the cursor was moved.
   bool WarpMouseCursorInNativeCoords(const gfx::Point& point_in_native,
                                      const gfx::Point& point_in_screen,
                                      bool update_mouse_location_now);
 
-  // Update the edge/indicator bounds based on the current
-  // display configuration.
-  scoped_ptr<WarpRegion> CreateHorizontalEdgeBounds(
-      const gfx::Display& a,
-      const gfx::Display& b,
-      DisplayPlacement::Position position);
-  scoped_ptr<WarpRegion> CreateVerticalEdgeBounds(
-      const gfx::Display& a,
-      const gfx::Display& b,
-      DisplayPlacement::Position position);
+  // Creates WarpRegion between display |a| and
+  // |b|. |drag_source_dispaly_id| is used to indicate in which

[stevenjb, 2016/03/24 18:08:30]

nit: |b|. on prev line

[oshima, 2016/03/24 20:37:19]

Done.

+  // display a drag is started, or invalid id passed if this is not
+  // for dragging. Returns null scoped_ptr if two displays do not
+  // share the edge.
+  scoped_ptr<WarpRegion> CreateWarpRegion(const gfx::Display& a,
+                                          const gfx::Display& b,
+                                          int64_t drag_source_dispay_id);
 
   void allow_non_native_event_for_test() { allow_non_native_event_ = true; }
 
   // The root window in which the dragging started.
   aura::Window* drag_source_root_;
 
   bool enabled_;
 
   bool allow_non_native_event_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtendedMouseWarpController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_EXTENDED_MOUSE_WARP_CONTROLLER_H