chrome/browser/ui/views/wrench_menu.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: chrome/browser/ui/views/wrench_menu.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

« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_dropdown.cc » ('j') | ui/base/models/table_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/wrench_menu.cc

diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc

index b624a334af650f9b657dc261db61d361f1a331da..88d9a1f21f2018bdbf3cc1d55b41fa9462ce1758 100644

--- a/chrome/browser/ui/views/wrench_menu.cc

+++ b/chrome/browser/ui/views/wrench_menu.cc

@@ -929,7 +929,7 @@ MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,

menu_item->SetVisible(model->IsVisibleAt(index));

if (menu_type == MenuModel::TYPE_COMMAND && model->HasIcons()) {

- SkBitmap icon;

+ gfx::ImageSkia icon;

if (model->GetIconAt(index, &icon))

menu_item->SetIcon(icon);

}