| 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 "ui/views/controls/menu/menu_item_view.h" | 8 #include "ui/views/controls/menu/menu_item_view.h" |
| 8 #include "ui/views/controls/menu/submenu_view.h" | 9 #include "ui/views/controls/menu/submenu_view.h" |
| 9 | 10 |
| 10 using base::ASCIIToUTF16; | 11 using base::ASCIIToUTF16; |
| 11 | 12 |
| 12 // Simple test for clicking a menu item. This template class clicks on an | 13 // Simple test for clicking a menu item. This template class clicks on an |
| 13 // item and checks that the returned id matches. The index of the item | 14 // item and checks that the returned id matches. The index of the item |
| 14 // is the template argument. | 15 // is the template argument. |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1 | 371 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1 |
| 371 #else | 372 #else |
| 372 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0 | 373 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0 |
| 373 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1 | 374 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1 |
| 374 #endif | 375 #endif |
| 375 // If this flakes, disable and log details in http://crbug.com/523255. | 376 // If this flakes, disable and log details in http://crbug.com/523255. |
| 376 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0) | 377 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0) |
| 377 | 378 |
| 378 // If this flakes, disable and log details in http://crbug.com/523255. | 379 // If this flakes, disable and log details in http://crbug.com/523255. |
| 379 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1) | 380 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1) |
| OLD | NEW |