OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <map> | 5 #include <map> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 // Include views_test_base.h first because the definition of None in X.h | 8 // Include views_test_base.h first because the definition of None in X.h |
9 // conflicts with the definition of None in gtest-type-util.h | 9 // conflicts with the definition of None in gtest-type-util.h |
10 #include "ui/views/test/views_test_base.h" | 10 #include "ui/views/test/views_test_base.h" |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 ASSERT_EQ(1u, events.size()); | 438 ASSERT_EQ(1u, events.size()); |
439 EXPECT_TRUE(client->MessageHasType(events[0], "XdndDrop")); | 439 EXPECT_TRUE(client->MessageHasType(events[0], "XdndDrop")); |
440 | 440 |
441 EXPECT_TRUE(client->IsMoveLoopRunning()); | 441 EXPECT_TRUE(client->IsMoveLoopRunning()); |
442 client->OnFinished(toplevel, true, client->GetAtom("XdndActionCopy")); | 442 client->OnFinished(toplevel, true, client->GetAtom("XdndActionCopy")); |
443 EXPECT_FALSE(client->IsMoveLoopRunning()); | 443 EXPECT_FALSE(client->IsMoveLoopRunning()); |
444 } | 444 } |
445 | 445 |
446 } // namespace | 446 } // namespace |
447 | 447 |
448 TEST_F(DesktopDragDropClientAuraX11Test, Basic) { | 448 // http://crbug.com/396468 |
| 449 TEST_F(DesktopDragDropClientAuraX11Test, DISABLED_Basic) { |
449 XID toplevel = 1; | 450 XID toplevel = 1; |
450 | 451 |
451 base::MessageLoop::current()->PostTask(FROM_HERE, | 452 base::MessageLoop::current()->PostTask(FROM_HERE, |
452 base::Bind(&BasicStep2, | 453 base::Bind(&BasicStep2, |
453 client(), | 454 client(), |
454 toplevel)); | 455 toplevel)); |
455 int result = StartDragAndDrop(); | 456 int result = StartDragAndDrop(); |
456 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result); | 457 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result); |
457 | 458 |
458 // Do another drag and drop to test that the data is properly cleaned up as a | 459 // Do another drag and drop to test that the data is properly cleaned up as a |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 | 671 |
671 // Repeat the test but reject the drop in the XdndFinished message instead. | 672 // Repeat the test but reject the drop in the XdndFinished message instead. |
672 base::MessageLoop::current()->PostTask( | 673 base::MessageLoop::current()->PostTask( |
673 FROM_HERE, | 674 FROM_HERE, |
674 base::Bind(&RejectAfterMouseReleaseStep3, client())); | 675 base::Bind(&RejectAfterMouseReleaseStep3, client())); |
675 result = StartDragAndDrop(); | 676 result = StartDragAndDrop(); |
676 EXPECT_EQ(ui::DragDropTypes::DRAG_NONE, result); | 677 EXPECT_EQ(ui::DragDropTypes::DRAG_NONE, result); |
677 } | 678 } |
678 | 679 |
679 } // namespace views | 680 } // namespace views |
OLD | NEW |