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 "ui/views/controls/menu/menu_model_adapter.h" |
5 #include "base/callback.h" | 6 #include "base/callback.h" |
6 #include "base/location.h" | 7 #include "base/location.h" |
7 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" |
8 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
9 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
11 #include "chrome/test/base/interactive_test_utils.h" | 13 #include "chrome/test/base/interactive_test_utils.h" |
12 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
13 #include "chrome/test/base/view_event_test_base.h" | 15 #include "chrome/test/base/view_event_test_base.h" |
14 #include "ui/base/models/menu_model.h" | 16 #include "ui/base/models/menu_model.h" |
15 #include "ui/base/test/ui_controls.h" | 17 #include "ui/base/test/ui_controls.h" |
16 #include "ui/views/controls/button/menu_button.h" | 18 #include "ui/views/controls/button/menu_button.h" |
17 #include "ui/views/controls/button/menu_button_listener.h" | 19 #include "ui/views/controls/button/menu_button_listener.h" |
18 #include "ui/views/controls/menu/menu_controller.h" | 20 #include "ui/views/controls/menu/menu_controller.h" |
19 #include "ui/views/controls/menu/menu_item_view.h" | 21 #include "ui/views/controls/menu/menu_item_view.h" |
20 #include "ui/views/controls/menu/menu_model_adapter.h" | |
21 #include "ui/views/controls/menu/menu_runner.h" | 22 #include "ui/views/controls/menu/menu_runner.h" |
22 #include "ui/views/controls/menu/submenu_view.h" | 23 #include "ui/views/controls/menu/submenu_view.h" |
23 #include "ui/views/widget/root_view.h" | 24 #include "ui/views/widget/root_view.h" |
24 #include "ui/views/widget/widget.h" | 25 #include "ui/views/widget/widget.h" |
25 | 26 |
26 namespace { | 27 namespace { |
27 | 28 |
28 const int kTopMenuBaseId = 100; | 29 const int kTopMenuBaseId = 100; |
29 const int kSubMenuBaseId = 200; | 30 const int kSubMenuBaseId = 200; |
30 | 31 |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 | 270 |
270 views::MenuButton* button_; | 271 views::MenuButton* button_; |
271 TopMenuModel top_menu_model_; | 272 TopMenuModel top_menu_model_; |
272 views::MenuModelAdapter menu_model_adapter_; | 273 views::MenuModelAdapter menu_model_adapter_; |
273 views::MenuItemView* menu_; | 274 views::MenuItemView* menu_; |
274 std::unique_ptr<views::MenuRunner> menu_runner_; | 275 std::unique_ptr<views::MenuRunner> menu_runner_; |
275 }; | 276 }; |
276 | 277 |
277 // If this flakes, disable and log details in http://crbug.com/523255. | 278 // If this flakes, disable and log details in http://crbug.com/523255. |
278 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 279 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |