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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/avatar_menu_item_gtk.h" 5 #include "chrome/browser/ui/gtk/avatar_menu_item_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 213 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
214 const SkBitmap* check_image = rb.GetImageNamed( 214 const SkBitmap* check_image = rb.GetImageNamed(
215 IDR_PROFILE_SELECTED).ToSkBitmap(); 215 IDR_PROFILE_SELECTED).ToSkBitmap();
216 gfx::Rect check_rect(0, 0, check_image->width(), check_image->height()); 216 gfx::Rect check_rect(0, 0, check_image->width(), check_image->height());
217 int y = avatar_image->height() - check_image->height(); 217 int y = avatar_image->height() - check_image->height();
218 int x = avatar_image->width() - check_image->width() + kCheckMarkXOffset; 218 int x = avatar_image->width() - check_image->width() + kCheckMarkXOffset;
219 canvas.DrawBitmapInt(*check_image, x, y); 219 canvas.DrawBitmapInt(*check_image, x, y);
220 220
221 SkBitmap final_image = canvas.ExtractBitmap(); 221 SkBitmap final_image = canvas.ExtractBitmap();
222 avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(&final_image); 222 avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(final_image);
223 } else { 223 } else {
224 avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(item_.icon.ToSkBitmap()); 224 avatar_pixbuf = gfx::GdkPixbufFromSkBitmap(*item_.icon.ToSkBitmap());
225 } 225 }
226 226
227 GtkWidget* avatar_image = gtk_image_new_from_pixbuf(avatar_pixbuf); 227 GtkWidget* avatar_image = gtk_image_new_from_pixbuf(avatar_pixbuf);
228 g_object_unref(avatar_pixbuf); 228 g_object_unref(avatar_pixbuf);
229 gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0); 229 gtk_misc_set_alignment(GTK_MISC(avatar_image), 0, 0);
230 gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0); 230 gtk_box_pack_start(GTK_BOX(item_hbox), avatar_image, FALSE, FALSE, 0);
231 231
232 // The user name label. 232 // The user name label.
233 GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0); 233 GtkWidget* item_vbox = gtk_vbox_new(FALSE, 0);
234 GtkWidget* name_label = NULL; 234 GtkWidget* name_label = NULL;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 281
282 GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); 282 GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
283 gtk_size_group_add_widget(size_group, status_label_); 283 gtk_size_group_add_widget(size_group, status_label_);
284 gtk_size_group_add_widget(size_group, link_alignment_); 284 gtk_size_group_add_widget(size_group, link_alignment_);
285 g_object_unref(size_group); 285 g_object_unref(size_group);
286 } 286 }
287 287
288 gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0); 288 gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
289 gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox); 289 gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
290 } 290 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_gtk.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698