chrome/common/badge_util.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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/common/badge_util.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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/common/badge_util.cc

diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc

index ccbaca1a2ae2fecffd99b42b13634126dc08d6c6..a762a6f89e2664bcf746bc084968f9914ced77aa 100644

--- a/chrome/common/badge_util.cc

+++ b/chrome/common/badge_util.cc

@@ -124,7 +124,7 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon,

// Render the badge bitmap and overlay into a canvas.

scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(

- gfx::Size(badge_width, icon.height()), ui::SCALE_FACTOR_100P, false));

+ gfx::Size(badge_width, icon.height()), 1.0f, false));

canvas->DrawImageInt(gfx::ImageSkia::CreateFrom1xBitmap(icon), 0, 0);

// Draw the text overlay centered horizontally and vertically. Skia expects