Improve WorkspaceWindowResizer::CompleteDrag() so that the function moves the window to a root windo

ash/extended_desktop_unittest.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/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/property_util.h"
@@ skipping 383 matching lines @@
   EXPECT_EQ(root_windows[1], d1->GetNativeView()->GetRootWindow());
   EXPECT_EQ("1560,30 100x100",
             d1->GetWindowBoundsInScreen().ToString());
 
   // Setting outside of root windows will be moved to primary root window.
   // TODO(oshima): This one probably should pick the closest root window.
   d1->SetBounds(gfx::Rect(200, 10, 100, 100));
   EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
 }
 
+TEST_F(ExtendedDesktopTest, MoveWindowToDisplay) {
+  UpdateDisplay("1000x1000,1000x1000");
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+
+  gfx::Display display0 =
+      gfx::Screen::GetDisplayMatching(root_windows[0]->GetBoundsInScreen());
+  gfx::Display display1 =
+      gfx::Screen::GetDisplayMatching(root_windows[1]->GetBoundsInScreen());
+  EXPECT_NE(display0.id(), display1.id());
+
+  views::Widget* d1 = CreateTestWidget(gfx::Rect(10, 10, 1000, 100));
+  EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
+
+  // Move the window where the window spans both root windows. Since the second
+  // parameter is |display1|, the window should be shown on the secondary root.
+  d1->GetNativeWindow()->SetBoundsInScreen(gfx::Rect(500, 10, 1000, 100),
+                                           display1);
+  EXPECT_EQ("500,10 1000x100",
+            d1->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(root_windows[1], d1->GetNativeView()->GetRootWindow());
+
+  // Move to the primary root.
+  d1->GetNativeWindow()->SetBoundsInScreen(gfx::Rect(500, 10, 1000, 100),
+                                           display0);
+  EXPECT_EQ("500,10 1000x100",
+            d1->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ(root_windows[0], d1->GetNativeView()->GetRootWindow());
+}
+
 TEST_F(ExtendedDesktopTest, MoveWindowWithTransient) {
   UpdateDisplay("1000x600,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   views::Widget* w1 = CreateTestWidget(gfx::Rect(10, 10, 100, 100));
   views::Widget* w1_t1 = CreateTestWidgetWithParent(
       w1, gfx::Rect(50, 50, 50, 50), false /* transient */);
   // Transient child of the transient child.
   views::Widget* w1_t11 = CreateTestWidgetWithParent(
       w1_t1, gfx::Rect(1200, 70, 30, 30), false /* transient */);
 
@@ skipping 97 matching lines @@
   p.SetPoint(0, 0);
   aura::Window::ConvertPointToTarget(root_windows[0], root_windows[1], &p);
   EXPECT_EQ("0,-600", p.ToString());
   p.SetPoint(0, 0);
   aura::Window::ConvertPointToTarget(d1, d2, &p);
   EXPECT_EQ("-10,-610", p.ToString());
 }
 
 }  // namespace internal
 }  // namespace ash