| 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 "base/macros.h" |
| 5 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 6 #include "chrome/browser/ui/views/menu_test_base.h" | 7 #include "chrome/browser/ui/views/menu_test_base.h" |
| 7 #include "chrome/test/base/interactive_test_utils.h" | 8 #include "chrome/test/base/interactive_test_utils.h" |
| 8 #include "ui/base/dragdrop/drag_drop_types.h" | 9 #include "ui/base/dragdrop/drag_drop_types.h" |
| 9 #include "ui/base/dragdrop/os_exchange_data.h" | 10 #include "ui/base/dragdrop/os_exchange_data.h" |
| 10 #include "ui/views/controls/menu/menu_controller.h" | 11 #include "ui/views/controls/menu/menu_controller.h" |
| 11 #include "ui/views/controls/menu/menu_item_view.h" | 12 #include "ui/views/controls/menu/menu_item_view.h" |
| 12 #include "ui/views/controls/menu/menu_runner.h" | 13 #include "ui/views/controls/menu/menu_runner.h" |
| 13 #include "ui/views/controls/menu/submenu_view.h" | 14 #include "ui/views/controls/menu/submenu_view.h" |
| 14 #include "ui/views/view.h" | 15 #include "ui/views/view.h" |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 ASSERT_TRUE(controller); | 508 ASSERT_TRUE(controller); |
| 508 EXPECT_TRUE(controller->IsCancelAllTimerRunningForTest()); | 509 EXPECT_TRUE(controller->IsCancelAllTimerRunningForTest()); |
| 509 | 510 |
| 510 Done(); | 511 Done(); |
| 511 } | 512 } |
| 512 | 513 |
| 513 // Test that if a menu is opened for a drop handled entirely by menu code, the | 514 // Test that if a menu is opened for a drop handled entirely by menu code, the |
| 514 // menu will try to close if it does not receive any drag updates. | 515 // menu will try to close if it does not receive any drag updates. |
| 515 // If this flakes, disable and log details in http://crbug.com/523255. | 516 // If this flakes, disable and log details in http://crbug.com/523255. |
| 516 VIEW_TEST(MenuViewDragAndDropForDropCancel, MenuViewCancelsForOwnDrag) | 517 VIEW_TEST(MenuViewDragAndDropForDropCancel, MenuViewCancelsForOwnDrag) |
| OLD | NEW |