Enforces 10px visibility when dragging between displays

ash/wm/drag_window_resizer_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/wm/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/drag_window_controller.h"
 #include "ash/wm/window_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 158 matching lines @@
   }
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              Shell::GetScreen()->GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window and move the pointer to (790, 10).
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
-    resizer->Drag(CalculateDragPoint(*resizer, 790, 10), 0);
+    resizer->Drag(CalculateDragPoint(*resizer, 795, 10), 0);
+    // Window should be adjusted for minimum visibility (10px) during the drag.
+    EXPECT_EQ("790,10 50x60", window_->bounds().ToString());
     resizer->CompleteDrag(0);
     // Since the pointer is still on the primary root window, the parent should
     // not be changed.
+    // Window origin should be adjusted for minimum visibility (10px).
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
     EXPECT_EQ("790,10 50x60", window_->bounds().ToString());
   }
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              Shell::GetScreen()->GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab the top-right edge of the window and move the pointer to (0, 10)
     // in the secondary root window's coordinates.
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(49, 0), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 751, 10), ui::EF_CONTROL_DOWN);
     resizer->CompleteDrag(0);
     // Since the pointer is on the secondary, the parent should be changed
     // even though only small fraction of the window is within the secondary
     // root window's bounds.
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
-    EXPECT_EQ("-49,10 50x60", window_->bounds().ToString());
+    // Window origin should be adjusted for minimum visibility (10px).
+    int expected_x = -50 + 10;
+    EXPECT_EQ(base::IntToString(expected_x) + ",10 50x60",
+              window_->bounds().ToString());
   }
 }
 
 // Verifies that dragging the active window to another display makes the new
 // root window the active root window.
 TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
   if (!SupportsMultipleDisplays())
     return;
 
   // The secondary display is logically on the right, but on the system (e.g. X)
@@ skipping 45 matching lines @@
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window.
     scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     // Move the mouse near the right edge, (798, 0), of the primary display.
     resizer->Drag(CalculateDragPoint(*resizer, -2, 0), ui::EF_CONTROL_DOWN);
     resizer->CompleteDrag(0);
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
-    EXPECT_EQ("798,0 50x60", window_->bounds().ToString());
+    // Window origin should be adjusted for minimum visibility (10px).
+    int expected_x = 800 - 10;
+    EXPECT_EQ(base::IntToString(expected_x) + ",0 50x60",
+              window_->bounds().ToString());
   }
 }
 
 // Verifies the drag window is shown correctly.
 TEST_F(DragWindowResizerTest, DragWindowController) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("800x600,800x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ skipping 361 matching lines @@
     resizer->CompleteDrag(0);
     EXPECT_EQ(1, session_delegate->num_transfer_to_desktop_of_user_calls());
     EXPECT_NE(initial_bounds.ToString(), window->bounds().ToString());
   }
 }
 #endif
 
 
 }  // namespace internal
 }  // namespace ash