Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3879)

Unified Diff: chrome/browser/ui/gtk/browser_titlebar.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/browser_titlebar.cc
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index 782563385a1ccd1eacef678e700c62f90343c2f2..30b1b773e08d2d032aad0e9b6250ee84931cb3b7 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -611,7 +611,7 @@ void BrowserTitlebar::UpdateTitleAndIcon() {
if (icon.empty()) {
gtk_util::SetWindowIcon(window_, profile);
} else {
- GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
+ GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
gtk_util::SetWindowIcon(window_, profile, icon_pixbuf);
g_object_unref(icon_pixbuf);
}
@@ -648,7 +648,7 @@ void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
} else {
- GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
+ GdkPixbuf* icon_pixbuf = gfx::GdkPixbufFromSkBitmap(icon);
gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
g_object_unref(icon_pixbuf);
}
@@ -1073,7 +1073,7 @@ static void MakeThrobberFrames(int resource_id,
for (size_t i = 0; i < num_frames; ++i) {
SkBitmap frame = SkBitmapOperations::CreateTiledBitmap(*frame_strip,
i * frame_size, 0, frame_size, frame_size);
- frames->push_back(gfx::GdkPixbufFromSkBitmap(&frame));
+ frames->push_back(gfx::GdkPixbufFromSkBitmap(frame));
}
}
« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/gtk/content_setting_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698