trunk/src/chrome/browser/ui/app_list/search/common/url_icon_source.cc - Issue 24262008: Revert 224473 "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: trunk/src/chrome/browser/ui/app_list/search/common/url_icon_source.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/

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: trunk/src/chrome/browser/ui/app_list/search/common/url_icon_source.cc

===================================================================

--- trunk/src/chrome/browser/ui/app_list/search/common/url_icon_source.cc (revision 224498)

+++ trunk/src/chrome/browser/ui/app_list/search/common/url_icon_source.cc (working copy)

@@ -47,15 +47,17 @@

icon_fetcher_->Start();

}

-gfx::ImageSkiaRep UrlIconSource::GetImageForScale(float scale) {

+gfx::ImageSkiaRep UrlIconSource::GetImageForScale(

+ ui::ScaleFactor scale_factor) {

if (!icon_fetch_attempted_)

StartIconFetch();

if (!icon_.isNull())

- return icon_.GetRepresentation(scale);

+ return icon_.GetRepresentation(scale_factor);

return ui::ResourceBundle::GetSharedInstance()

- .GetImageSkiaNamed(default_icon_resource_id_)->GetRepresentation(scale);

+ .GetImageSkiaNamed(default_icon_resource_id_)->GetRepresentation(

+ scale_factor);

}

void UrlIconSource::OnURLFetchComplete(