Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/drag_window_resizer_unittest.cc

Issue 13896026: Stick windows to sides of workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dock with zero width (drag resizer instance) Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/wm/drag_window_resizer.h ('K') | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/drag_window_resizer_unittest.cc
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index 1f632de4b8fc04bbb116b0635e594c60f9f62472..c8e751be4a62bd64c00836377315cb58bc7d7808 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -94,10 +94,10 @@ class DragWindowResizerTest : public test::AshTestBase {
}
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.GetInitialLocation();
location.set_x(location.x() + delta_x);
location.set_y(location.y() + delta_y);
return location;
@@ -107,14 +107,6 @@ class DragWindowResizerTest : public test::AshTestBase {
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_;
@@ -150,7 +142,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
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
@@ -168,7 +160,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
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);
@@ -185,7 +177,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
{
// 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);
@@ -214,7 +206,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysRightToLeft) {
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.
@@ -239,20 +231,22 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
- EXPECT_FALSE(resizer->drag_window_controller_.get());
+ internal::DragWindowResizer* drag_resizer = DragWindowResizer::instance_;
+ ASSERT_TRUE(drag_resizer);
+ 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_);
@@ -272,7 +266,7 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
// 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());
@@ -289,10 +283,12 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
EXPECT_EQ(root_windows[0], window_->GetRootWindow());
EXPECT_FLOAT_EQ(1.0f, window_->layer()->opacity());
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
- EXPECT_FALSE(resizer->drag_window_controller_.get());
+ internal::DragWindowResizer* drag_resizer = DragWindowResizer::instance_;
+ ASSERT_TRUE(drag_resizer);
+ EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
resizer->Drag(CalculateDragPoint(*resizer, 0, 610), 0);
resizer->RevertDrag();
@@ -312,7 +308,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
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,
@@ -323,7 +319,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
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_);
@@ -333,7 +329,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
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,
@@ -344,7 +340,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
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_);
@@ -378,7 +374,7 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) {
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());
@@ -398,7 +394,7 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) {
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());
@@ -432,7 +428,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
@@ -447,7 +443,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
@@ -462,7 +458,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
@@ -477,7 +473,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
@@ -493,7 +489,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
@@ -508,7 +504,7 @@ TEST_F(DragWindowResizerTest, MoveWindowAcrossDisplays) {
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);
« ash/wm/drag_window_resizer.h ('K') | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698