chrome/browser/ui/gtk/avatar_menu_item_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/avatar_menu_item_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/avatar_menu_item_gtk.cc

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

index 1eae14b2ade0c41350f8f7ac32e5518e56bbdca8..ee1c26e8f95d705933782c82f1ca59e8a75adf8e 100644

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

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

@@ -219,9 +219,9 @@ void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {

canvas.DrawBitmapInt(*check_image, x, y);

SkBitmap final_image = canvas.ExtractBitmap();

- avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(&final_image);

+ avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image);

} else {

- avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(item_.icon.ToSkBitmap());

+ avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(*item_.icon.ToSkBitmap());

}

GtkWidget* avatar_image = gtk_image_new_from_pixbuf(avatar_pixbuf);