chrome/browser/ui/gtk/avatar_menu_item_gtk.cc - Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep

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 10696130: Get rid of implicit conversion to and from ImageSkiaRep (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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 5cc78192ce322d1af5e707f5a223b1d1d61ffd7c..8797be31a3b100da8e11a72ba161d31e9c764b3a 100644

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

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

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

// of the profile icon.

if (item_.active) {

const SkBitmap* avatar_image = item_.icon.ToSkBitmap();

- gfx::Canvas canvas(*avatar_image, /* is_opaque */ true);

+ gfx::ImageSkiaRep avatar_image_rep =

+ gfx::ImageSkiaRep(*avatar_image, ui::SCALE_FACTOR_100P);

+ gfx::Canvas canvas(avatar_image_rep, /* is_opaque */ true);

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

const SkBitmap* check_image = rb.GetImageNamed(