ui/views/view_unittest.cc - Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

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

Unified Diff: ui/views/view_unittest.cc

Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Another day, another rebase Created 8 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:

Index: ui/views/view_unittest.cc

diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc

index bc233357704ea90659f39b38bcf209f70a213104..b99238ea7cc580d4ae1c977d4479df3ac164e824 100644

--- a/ui/views/view_unittest.cc

+++ b/ui/views/view_unittest.cc

@@ -1561,7 +1561,7 @@ class MockMenuModel : public ui::MenuModel {

ui::Accelerator* accelerator));

MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index));

MOCK_CONST_METHOD1(GetGroupIdAt, int(int index));

- MOCK_METHOD2(GetIconAt, bool(int index, gfx::ImageSkia* icon));

+ MOCK_METHOD2(GetIconAt, bool(int index, gfx::Image* icon));

MOCK_CONST_METHOD1(GetButtonMenuItemAt, ui::ButtonMenuItemModel*(int index));

MOCK_CONST_METHOD1(IsEnabledAt, bool(int index));

MOCK_CONST_METHOD1(IsVisibleAt, bool(int index));

« no previous file with comments | « ui/views/controls/menu/native_menu_win.cc ('k') | no next file » | no next file with comments »