ui/views/view_unittest.cc - Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to 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 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 years, 7 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 side-by-side diff with in-line comments

Download patch

Index: ui/views/view_unittest.cc

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

index 2e32f6304605dad09e9c0559df43a8f389206eba..f78e06f4ca281d263d34a3e3446c41a7082122ae 100644

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

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

@@ -1367,7 +1367,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, SkBitmap* icon));

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

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

MOCK_CONST_METHOD1(IsEnabledAt, bool(int index));

MOCK_CONST_METHOD1(IsVisibleAt, bool(int index));

« ui/views/controls/throbber.cc ('K') | « ui/views/examples/table_example.cc ('k') | no next file » | no next file with comments »