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/location.h" | 6 #include "base/location.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
11 #include "chrome/test/base/interactive_test_utils.h" | 11 #include "chrome/test/base/interactive_test_utils.h" |
12 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
13 #include "chrome/test/base/view_event_test_base.h" | 13 #include "chrome/test/base/view_event_test_base.h" |
14 #include "ui/base/models/menu_model.h" | 14 #include "ui/base/models/menu_model.h" |
15 #include "ui/base/test/ui_controls.h" | 15 #include "ui/base/test/ui_controls.h" |
16 #include "ui/views/controls/button/menu_button.h" | 16 #include "ui/views/controls/button/menu_button.h" |
17 #include "ui/views/controls/button/menu_button_listener.h" | 17 #include "ui/views/controls/button/menu_button_listener.h" |
18 #include "ui/views/controls/menu/menu_controller.h" | 18 #include "ui/views/controls/menu/menu_controller.h" |
19 #include "ui/views/controls/menu/menu_item_view.h" | 19 #include "ui/views/controls/menu/menu_item_view.h" |
20 #include "ui/views/controls/menu/menu_model_adapter.h" | 20 #include "ui/views/controls/menu/menu_model_adapter.h" |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 | 271 |
272 views::MenuButton* button_; | 272 views::MenuButton* button_; |
273 TopMenuModel top_menu_model_; | 273 TopMenuModel top_menu_model_; |
274 views::MenuModelAdapter menu_model_adapter_; | 274 views::MenuModelAdapter menu_model_adapter_; |
275 views::MenuItemView* menu_; | 275 views::MenuItemView* menu_; |
276 std::unique_ptr<views::MenuRunner> menu_runner_; | 276 std::unique_ptr<views::MenuRunner> menu_runner_; |
277 }; | 277 }; |
278 | 278 |
279 // If this flakes, disable and log details in http://crbug.com/523255. | 279 // If this flakes, disable and log details in http://crbug.com/523255. |
280 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 280 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |