chrome/browser/ui/gtk/browser_actions_toolbar_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/browser_actions_toolbar_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/browser_actions_toolbar_gtk.cc

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

index b982ff0bf32e853ef31d4551a24dfdcf4d6899ab..98337fb275475ba52e7a9a45bd0260ec8cc12fc5 100644

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

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

@@ -130,7 +130,7 @@ class BrowserActionButton : public content::NotificationObserver,

ui::ResourceBundle::GetSharedInstance().GetImageNamed(

IDR_EXTENSIONS_FAVICON).ToSkBitmap();

default_skbitmap_ = *bm;

- default_icon_ = gfx::GdkPixbufFromSkBitmap(bm);

+ default_icon_ = gfx::GdkPixbufFromSkBitmap(*bm);

}

UpdateState();

@@ -227,7 +227,7 @@ class BrowserActionButton : public content::NotificationObserver,

SkBitmap image = extension_->browser_action()->GetIcon(tab_id);

if (!image.isNull()) {

GdkPixbuf* previous_gdk_icon = tab_specific_icon_;

- tab_specific_icon_ = gfx::GdkPixbufFromSkBitmap(&image);

+ tab_specific_icon_ = gfx::GdkPixbufFromSkBitmap(image);

SetImage(tab_specific_icon_);

if (previous_gdk_icon)

g_object_unref(previous_gdk_icon);