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

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 (rebase) 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
« no previous file with comments | « 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 b54f59b6f1ac30286e4fa726ad2c7b093eab0052..1cf91d4ce3c173d2bb194d9cce413504f848b44a 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,13 +107,15 @@ class DragWindowResizerTest : public test::AshTestBase {
return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
}
- static DragWindowResizer* CreateDragWindowResizer(
+ static WindowResizer* CreateDragWindowResizer(
aura::Window* window,
const gfx::Point& point_in_parent,
int window_component) {
- return static_cast<DragWindowResizer*>(CreateWindowResizer(
- window, point_in_parent, window_component,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE).release());
+ return CreateWindowResizer(
+ window,
+ point_in_parent,
+ window_component,
+ aura::client::WINDOW_MOVE_SOURCE_MOUSE).release();
}
aura::test::TestWindowDelegate delegate_;
@@ -151,7 +153,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(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
// Drag the pointer to the right. Once it reaches the right edge of the
@@ -169,7 +171,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(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 790, 10), 0);
@@ -186,7 +188,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(CreateDragWindowResizer(
window_.get(), gfx::Point(49, 0), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 751, 10), ui::EF_CONTROL_DOWN);
@@ -215,7 +217,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(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
// Move the mouse near the right edge, (798, 0), of the primary display.
@@ -240,20 +242,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(CreateDragWindowResizer(
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_);
@@ -273,7 +277,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());
@@ -290,10 +294,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(CreateDragWindowResizer(
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();
@@ -313,7 +319,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
EXPECT_EQ(MouseCursorEventFilter::WARP_ALWAYS,
event_filter->mouse_warp_mode_);
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
// While dragging a window, warp should be allowed.
EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
@@ -324,7 +330,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
event_filter->mouse_warp_mode_);
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
EXPECT_EQ(MouseCursorEventFilter::WARP_DRAG,
event_filter->mouse_warp_mode_);
@@ -334,7 +340,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
event_filter->mouse_warp_mode_);
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTRIGHT));
// While resizing a window, warp should NOT be allowed.
EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
@@ -345,7 +351,7 @@ TEST_F(DragWindowResizerTest, WarpMousePointer) {
event_filter->mouse_warp_mode_);
{
- scoped_ptr<DragWindowResizer> resizer(CreateDragWindowResizer(
+ scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTRIGHT));
EXPECT_EQ(MouseCursorEventFilter::WARP_NONE,
event_filter->mouse_warp_mode_);
@@ -379,7 +385,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(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
ASSERT_TRUE(resizer.get());
@@ -399,7 +405,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(CreateDragWindowResizer(
window_.get(), gfx::Point(), HTCAPTION));
EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor());
ASSERT_TRUE(resizer.get());
@@ -433,7 +439,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
@@ -448,7 +454,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
@@ -463,7 +469,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
@@ -478,7 +484,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
@@ -494,7 +500,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
@@ -509,7 +515,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(CreateDragWindowResizer(
window, gfx::Point(), HTCAPTION));
ASSERT_TRUE(resizer.get());
resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
« no previous file with comments | « 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