chrome/browser/ui/views/menu_item_view_test.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

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 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/login_view.cc ('k') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('j') | no next file with comments »

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/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "chrome/test/base/interactive_test_utils.h"	7 #include "chrome/test/base/interactive_test_utils.h"

8 #include "chrome/test/base/ui_test_utils.h"	8 #include "chrome/test/base/ui_test_utils.h"

9 #include "chrome/test/base/view_event_test_base.h"	9 #include "chrome/test/base/view_event_test_base.h"

10 #include "ui/base/test/ui_controls.h"	10 #include "ui/base/test/ui_controls.h"

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

12 #include "ui/views/controls/button/menu_button_listener.h"	12 #include "ui/views/controls/button/menu_button_listener.h"

13 #include "ui/views/controls/menu/menu_controller.h"	13 #include "ui/views/controls/menu/menu_controller.h"

14 #include "ui/views/controls/menu/menu_item_view.h"	14 #include "ui/views/controls/menu/menu_item_view.h"

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

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

(...skipping 521 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
538 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;	538 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;

539 #if defined(OS_WIN)	539 #if defined(OS_WIN)

540 #define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0	540 #define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0

541 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1	541 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1

542 #else	542 #else

543 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0	543 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0

544 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1	544 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1

545 #endif	545 #endif

546 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0)	546 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0)

547 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1)	547 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1)

OLD	NEW