chrome/browser/ui/views/menu_item_view_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_item_view_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/login_view.cc ('k') | chrome/browser/ui/views/menu_model_adapter_test.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/views/widget/root_view.h"

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

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

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

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

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

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

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

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

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

17	17

18 // This is a convenience base class for all tests to provide some	18 // This is a convenience base class for all tests to provide some

19 // common functionality. It sets up a MenuButton and a MenuItemView	19 // common functionality. It sets up a MenuButton and a MenuItemView

20 // and clicks the MenuButton.	20 // and clicks the MenuButton.

21 //	21 //

22 // Subclasses should implement:	22 // Subclasses should implement:

23 // BuildMenu() populate the menu	23 // BuildMenu() populate the menu

24 // DoTestOnMessageLoop() initiate the test	24 // DoTestOnMessageLoop() initiate the test

25 //	25 //

26 // Subclasses can call:	26 // Subclasses can call:

(...skipping 453 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
480	480

481 private:	481 private:

482 int last_command_;	482 int last_command_;

483 views::MenuItemView* submenu_;	483 views::MenuItemView* submenu_;

484 };	484 };

485	485

486 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;	486 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;

487 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;	487 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;

488 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)	488 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)

489 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)	489 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)

OLD	NEW