OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/wm/workspace/workspace_window_resizer.h" | 5 #include "ash/wm/workspace/workspace_window_resizer.h" |
6 | 6 |
7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
8 #include "ash/display/mouse_cursor_event_filter.h" | 8 #include "ash/display/mouse_cursor_event_filter.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/screen_ash.h" | 10 #include "ash/screen_ash.h" |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 EXPECT_EQ("20,500 100x100", window3_->bounds().ToString()); | 450 EXPECT_EQ("20,500 100x100", window3_->bounds().ToString()); |
451 | 451 |
452 // 100 up again. | 452 // 100 up again. |
453 resizer->Drag(CalculateDragPoint(*resizer, -10, -100), 0); | 453 resizer->Drag(CalculateDragPoint(*resizer, -10, -100), 0); |
454 EXPECT_EQ("0,0 200x100", window_->bounds().ToString()); | 454 EXPECT_EQ("0,0 200x100", window_->bounds().ToString()); |
455 EXPECT_EQ("10,100 200x266", window2_->bounds().ToString()); | 455 EXPECT_EQ("10,100 200x266", window2_->bounds().ToString()); |
456 EXPECT_EQ("20,366 100x134", window3_->bounds().ToString()); | 456 EXPECT_EQ("20,366 100x134", window3_->bounds().ToString()); |
457 } | 457 } |
458 | 458 |
459 // Assertions around dragging to the left/right edge of the screen. | 459 // Assertions around dragging to the left/right edge of the screen. |
460 TEST_F(WorkspaceWindowResizerTest, Edge) { | 460 // TODO(phoglund): Re-enable once breakage from |
| 461 // https://chromiumcodereview.appspot.com/11369017 gets fixed. |
| 462 TEST_F(WorkspaceWindowResizerTest, DISABLED_Edge) { |
461 int bottom = | 463 int bottom = |
462 ScreenAsh::GetDisplayWorkAreaBoundsInParent(window_.get()).bottom(); | 464 ScreenAsh::GetDisplayWorkAreaBoundsInParent(window_.get()).bottom(); |
463 window_->SetBounds(gfx::Rect(20, 30, 50, 60)); | 465 window_->SetBounds(gfx::Rect(20, 30, 50, 60)); |
464 { | 466 { |
465 scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create( | 467 scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create( |
466 window_.get(), gfx::Point(), HTCAPTION, empty_windows())); | 468 window_.get(), gfx::Point(), HTCAPTION, empty_windows())); |
467 ASSERT_TRUE(resizer.get()); | 469 ASSERT_TRUE(resizer.get()); |
468 resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); | 470 resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0); |
469 resizer->CompleteDrag(0); | 471 resizer->CompleteDrag(0); |
470 EXPECT_EQ("0,0 720x" + base::IntToString(bottom), | 472 EXPECT_EQ("0,0 720x" + base::IntToString(bottom), |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 event_filter->WarpMouseCursorIfNecessary(root_windows[1], | 1404 event_filter->WarpMouseCursorIfNecessary(root_windows[1], |
1403 gfx::Point(400, 200)); | 1405 gfx::Point(400, 200)); |
1404 EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor()); | 1406 EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor()); |
1405 resizer->CompleteDrag(0); | 1407 resizer->CompleteDrag(0); |
1406 EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor()); | 1408 EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor()); |
1407 } | 1409 } |
1408 } | 1410 } |
1409 | 1411 |
1410 } // namespace internal | 1412 } // namespace internal |
1411 } // namespace ash | 1413 } // namespace ash |
OLD | NEW |