chrome/browser/ui/gtk/menu_gtk.cc - Issue 10860004: image-skia: Remove implicit conversion to SkBitmap on linux and chromeos.

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/menu_gtk.cc

Issue 10860004: image-skia: Remove implicit conversion to SkBitmap on linux and chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc ('k') | chrome/browser/ui/gtk/speech_recognition_bubble_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/menu_gtk.cc

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

index 0798728d518d58bf86a443789e65ae36753302c8..32790f237e195860115e1e3d16944d76329f400f 100644

--- a/chrome/browser/ui/gtk/menu_gtk.cc

+++ b/chrome/browser/ui/gtk/menu_gtk.cc

@@ -490,7 +490,7 @@ void MenuGtk::BuildSubmenuFromModel(ui::MenuModel* model, GtkWidget* menu) {

case ui::MenuModel::TYPE_COMMAND: {

int command_id = model->GetCommandIdAt(i);

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

- menu_item = BuildMenuItemWithImage(label, icon);

+ menu_item = BuildMenuItemWithImage(label, *icon.bitmap());

else

menu_item = BuildMenuItemWithLabel(label, command_id);

if (delegate_ && delegate_->AlwaysShowIconForCmd(command_id) &&

@@ -887,7 +887,7 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {

if (GTK_IS_IMAGE_MENU_ITEM(widget)) {

gfx::ImageSkia icon;

if (model->GetIconAt(id, &icon)) {

- GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(icon);

+ GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(*icon.bitmap());

gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),

gtk_image_new_from_pixbuf(pixbuf));

g_object_unref(pixbuf);