chrome/browser/ui/gtk/menu_gtk.cc - Issue 10377122: Convert GdkPixbufFromSkBitmap and GdkPixbufToSkBitmap

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 10377122: Convert GdkPixbufFromSkBitmap and GdkPixbufToSkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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 c259157684b4d741aeac7103073b7b8f220663a2..b58abe880b1aee97c4b9a7f4dccb006e9751a3a8 100644

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

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

@@ -421,7 +421,7 @@ GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,

GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,

const SkBitmap& icon) {

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

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

GtkWidget* menu_item = BuildMenuItemWithImage(label,

gtk_image_new_from_pixbuf(pixbuf));

g_object_unref(pixbuf);

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

if (GTK_IS_IMAGE_MENU_ITEM(widget)) {

SkBitmap icon;

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

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

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

gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),

gtk_image_new_from_pixbuf(pixbuf));

g_object_unref(pixbuf);