chrome/browser/ui/views/menu_model_adapter_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_model_adapter_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

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/models/menu_model.h"	10 #include "ui/base/models/menu_model.h"

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

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

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

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

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

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

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
315 views::MenuItemView* menu_;	315 views::MenuItemView* menu_;

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

317 };	317 };

318	318

319 #if defined(OS_WIN)	319 #if defined(OS_WIN)

320 #define MAYBE_RebuildMenu DISABLED_RebuildMenu	320 #define MAYBE_RebuildMenu DISABLED_RebuildMenu

321 #else	321 #else

322 #define MAYBE_RebuildMenu RebuildMenu	322 #define MAYBE_RebuildMenu RebuildMenu

323 #endif	323 #endif

324 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)	324 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)

OLD	NEW