chrome/browser/ui/views/toolbar_view.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/views/toolbar_view.cc

Issue 10696130: Get rid of implicit conversion to and from ImageSkiaRep (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 0 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/views/toolbar_view.cc

diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc

index 9499522fd2e44447283bd8e8c00c4ddc45d0f9f3..5157832fc892e4d529743a712df6cd6e532170fd 100644

--- a/chrome/browser/ui/views/toolbar_view.cc

+++ b/chrome/browser/ui/views/toolbar_view.cc

@@ -349,7 +349,8 @@ gfx::ImageSkia ToolbarView::GetAppMenuIcon(

return icon;

// Draw the chrome app menu icon onto the canvas.

- scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(icon, false));

+ gfx::ImageSkiaRep image_rep = gfx::ImageSkiaRep(icon, ui::SCALE_FACTOR_100P);

+ scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(image_rep, false));

gfx::ImageSkia badge;

// Only one badge can be active at any given time. The Upgrade notification