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