Stick windows to sides of workspaces

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"
@@ skipping 76 matching lines @@
   virtual void TearDown() OVERRIDE {
     window_.reset();
     always_on_top_window_.reset();
     system_modal_window_.reset();
     transient_parent_.reset();
     panel_window_.reset();
     AshTestBase::TearDown();
   }
 
  protected:
-  gfx::Point CalculateDragPoint(const DragWindowResizer& resizer,
+  gfx::Point CalculateDragPoint(const WindowResizer& resizer,
                                 int delta_x,
                                 int delta_y) const {
-    gfx::Point location = resizer.GetInitialLocationInParentForTest();
+    gfx::Point location = resizer.GetInitialLocationForTest();
     location.set_x(location.x() + delta_x);
     location.set_y(location.y() + delta_y);
     return location;
   }
 
   internal::ShelfLayoutManager* shelf_layout_manager() {
     return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   }
 
-  static DragWindowResizer* CreateDragWindowResizer(
-      aura::Window* window,
-      const gfx::Point& point_in_parent,
-      int window_component) {
-    return static_cast<DragWindowResizer*>(CreateWindowResizer(
-        window, point_in_parent, window_component).release());
-  }
-
   aura::test::TestWindowDelegate delegate_;
   aura::test::TestWindowDelegate delegate2_;
   aura::test::TestWindowDelegate delegate3_;
   aura::test::TestWindowDelegate delegate4_;
   aura::test::TestWindowDelegate delegate5_;
   aura::test::TestWindowDelegate delegate6_;
 
   scoped_ptr<aura::Window> window_;
   scoped_ptr<aura::Window> always_on_top_window_;
   scoped_ptr<aura::Window> system_modal_window_;
@@ skipping 15 matching lines @@
   UpdateDisplay("800x600,800x600");
   shelf_layout_manager()->LayoutShelf();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              Shell::GetScreen()->GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     // Drag the pointer to the right. Once it reaches the right edge of the
     // primary display, it warps to the secondary.
     resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
     resizer->CompleteDrag(0);
     // The whole window is on the secondary display now. The parent should be
     // changed.
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
     EXPECT_EQ("0,10 50x60", window_->bounds().ToString());
   }
 
   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<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 790, 10), 0);
     resizer->CompleteDrag(0);
     // Since the pointer is still on the primary root window, the parent should
     // not be changed.
     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<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         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());
   }
 }
 
 // Verifies a window can be moved from the secondary display to primary.
 TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("800x600,800x600");
   shelf_layout_manager()->LayoutShelf();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   window_->SetBoundsInScreen(
       gfx::Rect(800, 00, 50, 60),
       Shell::GetScreen()->GetDisplayNearestWindow(root_windows[1]));
   EXPECT_EQ(root_windows[1], window_->GetRootWindow());
   {
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         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());
   }
 }
 
 // Verifies the drag window is shown correctly.
 TEST_F(DragWindowResizerTest, DragWindowController) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("800x600,800x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              Shell::GetScreen()->GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
-        window_.get(), gfx::Point(), HTCAPTION));
+    internal::DragWindowResizer* drag_resizer = NULL;
+    scoped_ptr<WindowResizer> resizer(
+        internal::CreateWindowResizerExposeDragResizer(window_.get(),
+                                                       gfx::Point(),
+                                                       HTCAPTION,
+                                                       &drag_resizer));
+    ASSERT_TRUE(drag_resizer);
     ASSERT_TRUE(resizer.get());
-    EXPECT_FALSE(resizer->drag_window_controller_.get());
+    EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
 
     // The pointer is inside the primary root. The drag window controller
     // should be NULL.
     resizer->Drag(CalculateDragPoint(*resizer, 10, 10), 0);
-    EXPECT_FALSE(resizer->drag_window_controller_.get());
+    EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
 
     // The window spans both root windows.
     resizer->Drag(CalculateDragPoint(*resizer, 798, 10), 0);
     DragWindowController* controller =
-        resizer->drag_window_controller_.get();
+        drag_resizer->drag_window_controller_.get();
     ASSERT_TRUE(controller);
 
     ASSERT_TRUE(controller->drag_widget_);
     ui::Layer* drag_layer =
         controller->drag_widget_->GetNativeWindow()->layer();
     ASSERT_TRUE(drag_layer);
     // Check if |resizer->layer_| is properly set to the drag widget.
     const std::vector<ui::Layer*>& layers = drag_layer->children();
     EXPECT_FALSE(layers.empty());
     EXPECT_EQ(controller->layer_, layers.back());
 
     // |window_| should be opaque since the pointer is still on the primary
     // root window. The drag window should be semi-transparent.
     EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
     ASSERT_TRUE(controller->drag_widget_);
     EXPECT_GT(1.0f, drag_layer->opacity());
 
     // Enter the pointer to the secondary display.
     resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
-    controller = resizer->drag_window_controller_.get();
+    controller = drag_resizer->drag_window_controller_.get();
     ASSERT_TRUE(controller);
     // |window_| should be transparent, and the drag window should be opaque.
     EXPECT_GT(1.0f, window_->layer()->opacity());
     EXPECT_FLOAT_EQ(1.0f, drag_layer->opacity());
 
     resizer->CompleteDrag(0);
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
     EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
   }
 
   // Do the same test with RevertDrag().
   window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                              Shell::GetScreen()->GetPrimaryDisplay());
   EXPECT_EQ(root_windows[0], window_->GetRootWindow());
   EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
-        window_.get(), gfx::Point(), HTCAPTION));
+    internal::DragWindowResizer* drag_resizer = NULL;
+    scoped_ptr<WindowResizer> resizer(
+        internal::CreateWindowResizerExposeDragResizer(window_.get(),
+                                                       gfx::Point(),
+                                                       HTCAPTION,
+                                                       &drag_resizer));
+    ASSERT_TRUE(drag_resizer);
     ASSERT_TRUE(resizer.get());
-    EXPECT_FALSE(resizer->drag_window_controller_.get());
+    EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
 
     resizer->Drag(CalculateDragPoint(*resizer, 0, 610), 0);
     resizer->RevertDrag();
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
     EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
   }
 }
 
 // Verifies if the resizer sets and resets
 // MouseCursorEventFilter::mouse_warp_mode_ as expected.
 TEST_F(DragWindowResizerTest, WarpMousePointer) {
   MouseCursorEventFilter* event_filter =
       Shell::GetInstance()->mouse_cursor_filter();
   ASSERT_TRUE(event_filter);
   window_->SetBounds(gfx::Rect(0, 0, 50, 60));
 
   EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
             event_filter->mouse_warp_mode_);
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     // While dragging a window, warp should be allowed.
     EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
               event_filter->mouse_warp_mode_);
     resizer->CompleteDrag(0);
   }
   EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
             event_filter->mouse_warp_mode_);
 
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
               event_filter->mouse_warp_mode_);
     resizer->RevertDrag();
   }
   EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
             event_filter->mouse_warp_mode_);
 
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTRIGHT));
     // While resizing a window, warp should NOT be allowed.
     EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
               event_filter->mouse_warp_mode_);
     resizer->CompleteDrag(0);
   }
   EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
             event_filter->mouse_warp_mode_);
 
   {
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTRIGHT));
     EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
               event_filter->mouse_warp_mode_);
     resizer->RevertDrag();
   }
   EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
             event_filter->mouse_warp_mode_);
 }
 
 // Verifies cursor's device scale factor is updated whe a window is moved across
@@ skipping 13 matching lines @@
       Shell::GetInstance()->cursor_manager());
   MouseCursorEventFilter* event_filter =
       Shell::GetInstance()->mouse_cursor_filter();
   // Move window from the root window with 1.0 device scale factor to the root
   // window with 2.0 device scale factor.
   {
     window_->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                                Shell::GetScreen()->GetPrimaryDisplay());
     EXPECT_EQ(root_windows[0], window_->GetRootWindow());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                              gfx::Point(399, 200));
     EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor());
     resizer->CompleteDrag(0);
     EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor());
   }
 
   // Move window from the root window with 2.0 device scale factor to the root
   // window with 1.0 device scale factor.
   {
     window_->SetBoundsInScreen(
         gfx::Rect(600, 0, 50, 60),
         Shell::GetScreen()->GetDisplayNearestWindow(root_windows[1]));
     EXPECT_EQ(root_windows[1], window_->GetRootWindow());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window_.get(), gfx::Point(), HTCAPTION));
     EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor());
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, -200, 200), 0);
     event_filter->WarpMouseCursorIfNecessary(root_windows[1],
                                              gfx::Point(400, 200));
     EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
     resizer->CompleteDrag(0);
     EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
   }
@@ skipping 13 matching lines @@
   ASSERT_EQ(2U, root_windows.size());
   MouseCursorEventFilter* event_filter =
       Shell::GetInstance()->mouse_cursor_filter();
 
   // Normal window can be moved across display.
   {
     aura::Window* window = window_.get();
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                                          gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 
   // Always on top window can be moved across display.
   {
     aura::Window* window = always_on_top_window_.get();
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                                          gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 
   // System modal window can be moved across display.
   {
     aura::Window* window = system_modal_window_.get();
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                                          gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 
   // Transient window cannot be moved across display.
   {
     aura::Window* window = transient_child_;
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_FALSE(event_filter->WarpMouseCursorIfNecessary(
         root_windows[0],
         gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 
   // The parent of transient window can be moved across display.
   {
     aura::Window* window = transient_parent_.get();
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                                          gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 
   // Panel window can be moved across display.
   {
     aura::Window* window = panel_window_.get();
     window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
                               Shell::GetScreen()->GetPrimaryDisplay());
     // Grab (0, 0) of the window.
-    scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+    scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
         window, gfx::Point(), HTCAPTION));
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
     EXPECT_TRUE(event_filter->WarpMouseCursorIfNecessary(root_windows[0],
                                                          gfx::Point(399, 200)));
     resizer->CompleteDrag(0);
   }
 }
 
 }  // namespace internal
 }  // namespace ash