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 "base/callback.h" | 5 #include "base/callback.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/test/base/view_event_test_base.h" | 7 #include "chrome/test/base/view_event_test_base.h" |
8 #include "chrome/test/base/ui_test_utils.h" | 8 #include "chrome/test/base/ui_test_utils.h" |
9 #include "ui/ui_controls/ui_controls.h" | 9 #include "ui/ui_controls/ui_controls.h" |
10 #include "ui/views/controls/button/menu_button.h" | 10 #include "ui/views/controls/button/menu_button.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 // MenuItemViewTestInsertXY inserts an item at index X and selects the | 253 // MenuItemViewTestInsertXY inserts an item at index X and selects the |
254 // item at index Y (after the insertion). The tests here cover | 254 // item at index Y (after the insertion). The tests here cover |
255 // inserting at the beginning, middle, and end, crossbarred with | 255 // inserting at the beginning, middle, and end, crossbarred with |
256 // selecting the first and last item. | 256 // selecting the first and last item. |
257 typedef MenuItemViewTestInsert<0,0> MenuItemViewTestInsert00; | 257 typedef MenuItemViewTestInsert<0,0> MenuItemViewTestInsert00; |
258 typedef MenuItemViewTestInsert<0,2> MenuItemViewTestInsert02; | 258 typedef MenuItemViewTestInsert<0,2> MenuItemViewTestInsert02; |
259 typedef MenuItemViewTestInsert<1,0> MenuItemViewTestInsert10; | 259 typedef MenuItemViewTestInsert<1,0> MenuItemViewTestInsert10; |
260 typedef MenuItemViewTestInsert<1,2> MenuItemViewTestInsert12; | 260 typedef MenuItemViewTestInsert<1,2> MenuItemViewTestInsert12; |
261 typedef MenuItemViewTestInsert<2,0> MenuItemViewTestInsert20; | 261 typedef MenuItemViewTestInsert<2,0> MenuItemViewTestInsert20; |
262 typedef MenuItemViewTestInsert<2,2> MenuItemViewTestInsert22; | 262 typedef MenuItemViewTestInsert<2,2> MenuItemViewTestInsert22; |
263 VIEW_TEST(MenuItemViewTestInsert00, InsertItem00) | 263 #if defined(OS_WIN) |
264 VIEW_TEST(MenuItemViewTestInsert02, InsertItem02) | 264 #define MAYBE_InsertItem00 DISABLED_InsertItem00 |
265 VIEW_TEST(MenuItemViewTestInsert10, InsertItem10) | 265 #define MAYBE_InsertItem02 DISABLED_InsertItem02 |
266 VIEW_TEST(MenuItemViewTestInsert12, InsertItem12) | 266 #define MAYBE_InsertItem10 DISABLED_InsertItem10 |
267 VIEW_TEST(MenuItemViewTestInsert20, InsertItem20) | 267 #define MAYBE_InsertItem12 DISABLED_InsertItem12 |
268 VIEW_TEST(MenuItemViewTestInsert22, InsertItem22) | 268 #define MAYBE_InsertItem20 DISABLED_InsertItem20 |
| 269 #define MAYBE_InsertItem22 DISABLED_InsertItem22 |
| 270 #else |
| 271 #define MAYBE_InsertItem00 InsertItem00 |
| 272 #define MAYBE_InsertItem02 InsertItem02 |
| 273 #define MAYBE_InsertItem10 InsertItem10 |
| 274 #define MAYBE_InsertItem12 InsertItem12 |
| 275 #define MAYBE_InsertItem20 InsertItem20 |
| 276 #define MAYBE_InsertItem22 InsertItem22 |
| 277 #endif |
| 278 VIEW_TEST(MenuItemViewTestInsert00, MAYBE_InsertItem00) |
| 279 VIEW_TEST(MenuItemViewTestInsert02, MAYBE_InsertItem02) |
| 280 VIEW_TEST(MenuItemViewTestInsert10, MAYBE_InsertItem10) |
| 281 VIEW_TEST(MenuItemViewTestInsert12, MAYBE_InsertItem12) |
| 282 VIEW_TEST(MenuItemViewTestInsert20, MAYBE_InsertItem20) |
| 283 VIEW_TEST(MenuItemViewTestInsert22, MAYBE_InsertItem22) |
269 | 284 |
270 // Test class for inserting a menu item while a submenu is open. | 285 // Test class for inserting a menu item while a submenu is open. |
271 template<int INSERT_INDEX> | 286 template<int INSERT_INDEX> |
272 class MenuItemViewTestInsertWithSubmenu : public MenuItemViewTestBase { | 287 class MenuItemViewTestInsertWithSubmenu : public MenuItemViewTestBase { |
273 public: | 288 public: |
274 MenuItemViewTestInsertWithSubmenu() : | 289 MenuItemViewTestInsertWithSubmenu() : |
275 last_command_(0), | 290 last_command_(0), |
276 submenu_(NULL), | 291 submenu_(NULL), |
277 inserted_item_(NULL) { | 292 inserted_item_(NULL) { |
278 } | 293 } |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 | 506 |
492 private: | 507 private: |
493 int last_command_; | 508 int last_command_; |
494 views::MenuItemView* submenu_; | 509 views::MenuItemView* submenu_; |
495 }; | 510 }; |
496 | 511 |
497 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; | 512 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; |
498 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; | 513 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; |
499 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) | 514 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) |
500 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) | 515 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) |
OLD | NEW |