Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: chrome/browser/ui/app_list/search/common/url_icon_source.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_list/search/common/url_icon_source.cc
diff --git a/chrome/browser/ui/app_list/search/common/url_icon_source.cc b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
index 443da12ce6f9f02e83a8f01240bad08b09454ee4..acb2d288161215d7f30c4116502206bba80ba149 100644
--- a/chrome/browser/ui/app_list/search/common/url_icon_source.cc
+++ b/chrome/browser/ui/app_list/search/common/url_icon_source.cc
@@ -47,17 +47,15 @@ void UrlIconSource::StartIconFetch() {
icon_fetcher_->Start();
}
-gfx::ImageSkiaRep UrlIconSource::GetImageForScale(
- ui::ScaleFactor scale_factor) {
+gfx::ImageSkiaRep UrlIconSource::GetImageForScale(float scale) {
if (!icon_fetch_attempted_)
StartIconFetch();
if (!icon_.isNull())
- return icon_.GetRepresentation(scale_factor);
+ return icon_.GetRepresentation(scale);
return ui::ResourceBundle::GetSharedInstance()
- .GetImageSkiaNamed(default_icon_resource_id_)->GetRepresentation(
- scale_factor);
+ .GetImageSkiaNamed(default_icon_resource_id_)->GetRepresentation(scale);
}
void UrlIconSource::OnURLFetchComplete(
« no previous file with comments | « chrome/browser/ui/app_list/search/common/url_icon_source.h ('k') | chrome/browser/ui/app_list/search/people/people_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698