OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
6 #include "chrome/browser/automation/ui_controls.h" | 7 #include "chrome/browser/automation/ui_controls.h" |
7 #include "chrome/test/base/view_event_test_base.h" | 8 #include "chrome/test/base/view_event_test_base.h" |
8 #include "views/controls/button/menu_button.h" | 9 #include "views/controls/button/menu_button.h" |
9 #include "views/controls/menu/menu_controller.h" | 10 #include "views/controls/menu/menu_controller.h" |
10 #include "views/controls/menu/menu_item_view.h" | 11 #include "views/controls/menu/menu_item_view.h" |
11 #include "views/controls/menu/menu_runner.h" | 12 #include "views/controls/menu/menu_runner.h" |
12 #include "views/controls/menu/submenu_view.h" | 13 #include "views/controls/menu/submenu_view.h" |
13 #include "views/controls/menu/view_menu_delegate.h" | 14 #include "views/controls/menu/view_menu_delegate.h" |
14 #include "views/widget/root_view.h" | 15 #include "views/widget/root_view.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 ignore_result(menu_runner_->RunMenuAt( | 76 ignore_result(menu_runner_->RunMenuAt( |
76 source->GetWidget(), | 77 source->GetWidget(), |
77 button_, | 78 button_, |
78 bounds, | 79 bounds, |
79 views::MenuItemView::TOPLEFT, | 80 views::MenuItemView::TOPLEFT, |
80 views::MenuRunner::HAS_MNEMONICS)); | 81 views::MenuRunner::HAS_MNEMONICS)); |
81 } | 82 } |
82 | 83 |
83 protected: | 84 protected: |
84 // Generate a mouse click on the specified view and post a new task. | 85 // Generate a mouse click on the specified view and post a new task. |
85 virtual void Click(views::View* view, Task* next) { | 86 virtual void Click(views::View* view, const base::Closure& next) { |
86 ui_controls::MoveMouseToCenterAndPress( | 87 ui_controls::MoveMouseToCenterAndPress( |
87 view, | 88 view, |
88 ui_controls::LEFT, | 89 ui_controls::LEFT, |
89 ui_controls::DOWN | ui_controls::UP, | 90 ui_controls::DOWN | ui_controls::UP, |
90 next); | 91 next); |
91 } | 92 } |
92 | 93 |
93 virtual void BuildMenu(views::MenuItemView* menu) { | 94 virtual void BuildMenu(views::MenuItemView* menu) { |
94 } | 95 } |
95 | 96 |
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 | 476 |
476 private: | 477 private: |
477 int last_command_; | 478 int last_command_; |
478 views::MenuItemView* submenu_; | 479 views::MenuItemView* submenu_; |
479 }; | 480 }; |
480 | 481 |
481 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; | 482 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; |
482 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; | 483 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; |
483 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) | 484 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) |
484 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) | 485 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) |
OLD | NEW |