| 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/drag_drop/drag_drop_controller.h" | 5 #include "ash/drag_drop/drag_drop_controller.h" |
| 6 | 6 |
| 7 #include "ash/drag_drop/drag_drop_tracker.h" | 7 #include "ash/drag_drop/drag_drop_tracker.h" |
| 8 #include "ash/drag_drop/drag_image_view.h" | 8 #include "ash/drag_drop/drag_image_view.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| (...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 // TODO(win_aura) http://crbug.com/154081 | 554 // TODO(win_aura) http://crbug.com/154081 |
| 555 #if defined(OS_WIN) | 555 #if defined(OS_WIN) |
| 556 #define MAYBE_ViewRemovedWhileInDragDropTest DISABLED_ViewRemovedWhileInDragDrop
Test | 556 #define MAYBE_ViewRemovedWhileInDragDropTest DISABLED_ViewRemovedWhileInDragDrop
Test |
| 557 #else | 557 #else |
| 558 #define MAYBE_ViewRemovedWhileInDragDropTest ViewRemovedWhileInDragDropTest | 558 #define MAYBE_ViewRemovedWhileInDragDropTest ViewRemovedWhileInDragDropTest |
| 559 #endif | 559 #endif |
| 560 TEST_F(DragDropControllerTest, MAYBE_ViewRemovedWhileInDragDropTest) { | 560 TEST_F(DragDropControllerTest, MAYBE_ViewRemovedWhileInDragDropTest) { |
| 561 std::unique_ptr<views::Widget> widget(CreateNewWidget()); | 561 std::unique_ptr<views::Widget> widget(CreateNewWidget()); |
| 562 std::unique_ptr<DragTestView> drag_view(new DragTestView); | 562 std::unique_ptr<DragTestView> drag_view(new DragTestView); |
| 563 AddViewToWidgetAndResize(widget.get(), drag_view.get()); | 563 AddViewToWidgetAndResize(widget.get(), drag_view.get()); |
| 564 gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint(); | |
| 565 ui::OSExchangeData data; | 564 ui::OSExchangeData data; |
| 566 data.SetString(base::UTF8ToUTF16("I am being dragged")); | 565 data.SetString(base::UTF8ToUTF16("I am being dragged")); |
| 567 | 566 |
| 568 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); | 567 ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); |
| 569 generator.MoveMouseToCenterOf(widget->GetNativeView()); | 568 generator.MoveMouseToCenterOf(widget->GetNativeView()); |
| 570 generator.PressLeftButton(); | 569 generator.PressLeftButton(); |
| 571 | 570 |
| 572 int num_drags_1 = 17; | 571 int num_drags_1 = 17; |
| 573 for (int i = 0; i < num_drags_1; ++i) { | 572 for (int i = 0; i < num_drags_1; ++i) { |
| 574 // Because we are not doing a blocking drag and drop, the original | 573 // Because we are not doing a blocking drag and drop, the original |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 drag_drop_controller_->drag_string_); | 1101 drag_drop_controller_->drag_string_); |
| 1103 EXPECT_EQ(1, drag_view->num_drag_enters_); | 1102 EXPECT_EQ(1, drag_view->num_drag_enters_); |
| 1104 EXPECT_EQ(2, drag_view->num_drag_updates_); | 1103 EXPECT_EQ(2, drag_view->num_drag_updates_); |
| 1105 EXPECT_EQ(1, drag_view->num_drops_); | 1104 EXPECT_EQ(1, drag_view->num_drops_); |
| 1106 EXPECT_EQ(0, drag_view->num_drag_exits_); | 1105 EXPECT_EQ(0, drag_view->num_drag_exits_); |
| 1107 EXPECT_TRUE(drag_view->drag_done_received_); | 1106 EXPECT_TRUE(drag_view->drag_done_received_); |
| 1108 } | 1107 } |
| 1109 | 1108 |
| 1110 } // namespace test | 1109 } // namespace test |
| 1111 } // namespace ash | 1110 } // namespace ash |
| OLD | NEW |