ui/views/controls/menu/menu_model_adapter_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/controls/menu/menu_model_adapter_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

« ui/views/controls/button/text_button.h ('K') | « ui/views/controls/menu/menu_item_view_views.cc ('k') | ui/views/controls/menu/menu_win.h » ('j') | ui/views/controls/menu/native_menu_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/menu/menu_model_adapter_unittest.cc

diff --git a/ui/views/controls/menu/menu_model_adapter_unittest.cc b/ui/views/controls/menu/menu_model_adapter_unittest.cc

index ba6d40658d4b7cf11bb3e95f6e996a8b243104ed..8f86335aa5a688d04642e4c336b38380b2c6d51e 100644

--- a/ui/views/controls/menu/menu_model_adapter_unittest.cc

+++ b/ui/views/controls/menu/menu_model_adapter_unittest.cc

@@ -79,7 +79,7 @@ class MenuModelBase : public ui::MenuModel {

return 0;

}

- virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE {

+ virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE {

return false;

}