chrome/browser/ui/views/menu_model_adapter_test.cc - Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/views/menu_model_adapter_test.cc

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/menu_item_view_test.cc ('k') | chrome/browser/ui/views/native_constrained_window_aura.cc » ('j') | no next file with comments »

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 "ui/views/test/test_views_delegate.h"

11 #include "ui/views/widget/root_view.h"

12 #include "ui/views/widget/widget.h"

13 #include "views/controls/button/menu_button.h"	11 #include "views/controls/button/menu_button.h"

14 #include "views/controls/menu/menu_controller.h"	12 #include "views/controls/menu/menu_controller.h"

15 #include "views/controls/menu/menu_item_view.h"	13 #include "views/controls/menu/menu_item_view.h"

16 #include "views/controls/menu/menu_model_adapter.h"	14 #include "views/controls/menu/menu_model_adapter.h"

17 #include "views/controls/menu/menu_runner.h"	15 #include "views/controls/menu/menu_runner.h"

18 #include "views/controls/menu/submenu_view.h"	16 #include "views/controls/menu/submenu_view.h"

19 #include "views/controls/menu/view_menu_delegate.h"	17 #include "views/controls/menu/view_menu_delegate.h"

20 #include "views/views_delegate.h"	18 #include "views/views_delegate.h"

	19 #include "views/widget/root_view.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.

28 class TestViewsDelegate : public views::ViewsDelegate {	28 class TestViewsDelegate : public views::ViewsDelegate {

29 public:	29 public:

30 TestViewsDelegate() {	30 TestViewsDelegate() {

(...skipping 329 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
360 TestViewsDelegate views_delegate_;	360 TestViewsDelegate views_delegate_;

361	361

362 views::MenuButton* button_;	362 views::MenuButton* button_;

363 TopMenuModel top_menu_model_;	363 TopMenuModel top_menu_model_;

364 views::MenuModelAdapter menu_model_adapter_;	364 views::MenuModelAdapter menu_model_adapter_;

365 views::MenuItemView* menu_;	365 views::MenuItemView* menu_;

366 scoped_ptr<views::MenuRunner> menu_runner_;	366 scoped_ptr<views::MenuRunner> menu_runner_;

367 };	367 };

368	368

369 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)	369 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)

OLD	NEW