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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/favicon/favicon_handler.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/extensions/image_loader.cc ('k') | trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/favicon/favicon_handler.cc
===================================================================
--- trunk/src/chrome/browser/favicon/favicon_handler.cc (revision 224497)
+++ trunk/src/chrome/browser/favicon/favicon_handler.cc (working copy)
@@ -67,7 +67,7 @@
base_size = 0;
break;
}
- return gfx::ImageSkia::GetMaxSupportedScale() * base_size;
+ return ui::GetScaleFactorScale(ui::GetMaxScaleFactor()) * base_size;
}
bool DoUrlAndIconMatch(const FaviconURL& favicon_url,
@@ -148,7 +148,7 @@
FaviconUtil::GetFaviconScaleFactors();
for (size_t i = 0; i < scale_factors.size(); ++i) {
int edge_size_in_pixel = floor(
- desired_size_in_dip * ui::GetImageScale(scale_factors[i]));
+ desired_size_in_dip * ui::GetScaleFactorScale(scale_factors[i]));
std::vector<gfx::Size>::iterator it = std::find(favicon_sizes.begin(),
favicon_sizes.end(), gfx::Size(edge_size_in_pixel, edge_size_in_pixel));
if (it == favicon_sizes.end())
« no previous file with comments | « trunk/src/chrome/browser/extensions/image_loader.cc ('k') | trunk/src/chrome/browser/favicon/favicon_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698