chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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: chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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: chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

index 181e51995fce76e6185852c5776cbb0170057088..43f047350f3188a11675a17ac25c229646e9aac0 100644

--- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

@@ -82,7 +82,7 @@ void BookmarkNodeMenuModel::PopulateMenu() {

AddItem(kBookmarkItemCommandId, label);

const gfx::Image& node_icon = model_->GetFavicon(child);

if (!node_icon.IsEmpty())

- SetIcon(GetItemCount() - 1, *node_icon.ToSkBitmap());

+ SetIcon(GetItemCount() - 1, node_icon);

// TODO(mdm): set up an observer to watch for icon load events and set

// the icons in response.

}