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/callback.h" |
6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/automation/ui_controls.h" | 7 #include "chrome/browser/automation/ui_controls.h" |
8 #include "chrome/test/base/view_event_test_base.h" | 8 #include "chrome/test/base/view_event_test_base.h" |
9 #include "ui/base/models/menu_model.h" | 9 #include "ui/base/models/menu_model.h" |
| 10 #include "ui/views/test/test_views_delegate.h" |
10 #include "views/controls/button/menu_button.h" | 11 #include "views/controls/button/menu_button.h" |
11 #include "views/controls/menu/menu_controller.h" | 12 #include "views/controls/menu/menu_controller.h" |
12 #include "views/controls/menu/menu_item_view.h" | 13 #include "views/controls/menu/menu_item_view.h" |
13 #include "views/controls/menu/menu_model_adapter.h" | 14 #include "views/controls/menu/menu_model_adapter.h" |
14 #include "views/controls/menu/menu_runner.h" | 15 #include "views/controls/menu/menu_runner.h" |
15 #include "views/controls/menu/submenu_view.h" | 16 #include "views/controls/menu/submenu_view.h" |
16 #include "views/controls/menu/view_menu_delegate.h" | 17 #include "views/controls/menu/view_menu_delegate.h" |
17 #include "views/test/test_views_delegate.h" | |
18 #include "views/views_delegate.h" | 18 #include "views/views_delegate.h" |
19 #include "views/widget/root_view.h" | 19 #include "views/widget/root_view.h" |
20 #include "views/widget/widget.h" | 20 #include "views/widget/widget.h" |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 const int kTopMenuBaseId = 100; | 24 const int kTopMenuBaseId = 100; |
25 const int kSubMenuBaseId = 200; | 25 const int kSubMenuBaseId = 200; |
26 | 26 |
27 // ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter. | 27 // ViewsDelegate::GetDispositionForEvent() is used by views::MenuModelAdapter. |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 TestViewsDelegate views_delegate_; | 364 TestViewsDelegate views_delegate_; |
365 | 365 |
366 views::MenuButton* button_; | 366 views::MenuButton* button_; |
367 TopMenuModel top_menu_model_; | 367 TopMenuModel top_menu_model_; |
368 views::MenuModelAdapter menu_model_adapter_; | 368 views::MenuModelAdapter menu_model_adapter_; |
369 views::MenuItemView* menu_; | 369 views::MenuItemView* menu_; |
370 scoped_ptr<views::MenuRunner> menu_runner_; | 370 scoped_ptr<views::MenuRunner> menu_runner_; |
371 }; | 371 }; |
372 | 372 |
373 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 373 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |