Enforces 10px visibility when dragging between displays

ash/wm/window_resizer.cc

 // Copyright (c) 2012 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.
 
 #include "ash/wm/window_resizer.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 245 matching lines @@
       // be still hit by the cursor.
       if (details.initial_location_in_parent.x() >
           details.initial_bounds_in_parent.x() + details.restore_bounds.width())
         new_bounds.set_x(location.x() - details.restore_bounds.width() / 2);
     }
 
     // Make sure that |new_bounds| doesn't leave any of the displays.  Note that
     // the |work_area| above isn't good for this check since it is the work area
     // for the current display but the window can move to a different one.
     aura::Window* parent = details.window->parent();
-    gfx::Rect new_bounds_in_screen =
-        ScreenAsh::ConvertRectToScreen(parent, new_bounds);
+    gfx::Point passed_location_in_screen(passed_location);
+    wm::ConvertPointToScreen(parent, &passed_location_in_screen);
+    gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());
+    // Use a pointer location (matching the logic in DragWindowResizer) to
+    // calculate the target display after the drag.
     const gfx::Display& display =
-        Shell::GetScreen()->GetDisplayMatching(new_bounds_in_screen);
+        Shell::GetScreen()->GetDisplayMatching(near_passed_location);
     aura::Window* dock_container = Shell::GetContainer(
-        wm::GetRootWindowMatching(new_bounds_in_screen),
+        wm::GetRootWindowMatching(near_passed_location),
         internal::kShellWindowId_DockedContainer);
     internal::DockedWindowLayoutManager* dock_layout =
         static_cast<internal::DockedWindowLayoutManager*>(
             dock_container->layout_manager());
 
     gfx::Rect screen_work_area = display.work_area();
     screen_work_area.Union(dock_layout->docked_bounds());
     screen_work_area.Inset(kMinimumOnScreenArea, 0);
+    gfx::Rect new_bounds_in_screen =
+        ScreenAsh::ConvertRectToScreen(parent, new_bounds);
     if (!screen_work_area.Intersects(new_bounds_in_screen)) {
       // Make sure that the x origin does not leave the current display.
       new_bounds_in_screen.set_x(
           std::max(screen_work_area.x() - new_bounds.width(),
                    std::min(screen_work_area.right(),
                             new_bounds_in_screen.x())));
       new_bounds =
           ScreenAsh::ConvertRectFromScreen(parent, new_bounds_in_screen);
     }
   }
@@ skipping 128 matching lines @@
     if (height > max_height) {
       height = max_height;
       *delta_y = -y_multiplier * (details.initial_bounds_in_parent.height() -
                                   max_height);
     }
   }
   return height;
 }
 
 }  // namespace aura