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

Unified Diff: chrome/browser/ui/gtk/location_bar_view_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index ec53c1eafd5cafcd3c3be41c68c13cbc5d894667..45399d502b69005c0d21f4e2a51a6a2120961a29 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -1012,7 +1012,7 @@ void LocationBarViewGtk::SetKeywordLabel(const string16& keyword) {
template_url_service->GetTemplateURLForKeyword(keyword);
const SkBitmap& bitmap = profile->GetExtensionService()->
GetOmniboxIcon(template_url->GetExtensionId());
- GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
+ GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_), pixbuf);
g_object_unref(pixbuf);
} else {
@@ -1125,7 +1125,7 @@ void LocationBarViewGtk::OnIconDragData(GtkWidget* sender,
void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender,
GdkDragContext* context) {
SkBitmap favicon = GetFavicon();
- GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&favicon);
+ GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(favicon);
if (!pixbuf)
return;
drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf,
@@ -1596,7 +1596,7 @@ void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility(
if (last_icon_pixbuf_)
g_object_unref(last_icon_pixbuf_);
last_icon_skbitmap_ = icon;
- last_icon_pixbuf_ = gfx::GdkPixbufFromSkBitmap(&icon);
+ last_icon_pixbuf_ = gfx::GdkPixbufFromSkBitmap(icon);
}
DCHECK(last_icon_pixbuf_);
pixbuf = last_icon_pixbuf_;
« no previous file with comments | « chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698