chrome/browser/ui/views/menu_model_adapter_test.cc - Issue 7568002: Move more files from chrome/test to chrome/test/base, part #6

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 7568002: Move more files from chrome/test to chrome/test/base, part #6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 months 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/chrome_tests.gypi » ('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 "chrome/browser/automation/ui_controls.h"	5 #include "chrome/browser/automation/ui_controls.h"

6 #include "chrome/test/interactive_ui/view_event_test_base.h"	6 #include "chrome/test/base/view_event_test_base.h"

7 #include "ui/base/models/menu_model.h"	7 #include "ui/base/models/menu_model.h"

8 #include "views/controls/button/menu_button.h"	8 #include "views/controls/button/menu_button.h"

9 #include "views/controls/menu/menu_controller.h"	9 #include "views/controls/menu/menu_controller.h"

10 #include "views/controls/menu/menu_item_view.h"	10 #include "views/controls/menu/menu_item_view.h"

11 #include "views/controls/menu/menu_model_adapter.h"	11 #include "views/controls/menu/menu_model_adapter.h"

12 #include "views/controls/menu/submenu_view.h"	12 #include "views/controls/menu/submenu_view.h"

13 #include "views/controls/menu/view_menu_delegate.h"	13 #include "views/controls/menu/view_menu_delegate.h"

14 #include "views/test/test_views_delegate.h"	14 #include "views/test/test_views_delegate.h"

15 #include "views/views_delegate.h"	15 #include "views/views_delegate.h"

16 #include "views/widget/root_view.h"	16 #include "views/widget/root_view.h"

(...skipping 346 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
363 views::ViewsDelegate* old_views_delegate_;	363 views::ViewsDelegate* old_views_delegate_;

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 scoped_ptr<views::MenuItemView> menu_;	369 scoped_ptr<views::MenuItemView> menu_;

370 };	370 };

371	371

372 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)	372 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)

OLD	NEW