chrome/browser/history/select_favicon_frames.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/browser/history/select_favicon_frames.cc

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

Patch Set: 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/browser/history/select_favicon_frames.cc

diff --git a/chrome/browser/history/select_favicon_frames.cc b/chrome/browser/history/select_favicon_frames.cc

index 03158b2184182ca549810571b364d39d65f15c58..53ad9cd491abc8d3a7051cc1f2f59d20d8afa7f4 100644

--- a/chrome/browser/history/select_favicon_frames.cc

+++ b/chrome/browser/history/select_favicon_frames.cc

@@ -225,7 +225,8 @@ gfx::ImageSkia SelectFaviconFrames(

SkBitmap resized_bitmap = GetResizedBitmap(bitmaps[result.index],

desired_size, result.scale_factor, result.resize_method);

multi_image.AddRepresentation(

- gfx::ImageSkiaRep(resized_bitmap, result.scale_factor));

+ gfx::ImageSkiaRep(resized_bitmap,

+ ui::GetScaleFactorScale(result.scale_factor)));

}

return multi_image;

}