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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/ui/webui/fileicon_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc ('k') | trunk/src/chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/ui/webui/fileicon_source.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/fileicon_source.cc (revision 224498)
+++ trunk/src/chrome/browser/ui/webui/fileicon_source.cc (working copy)
@@ -103,8 +103,7 @@
if (icon) {
scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
gfx::PNGCodec::EncodeBGRASkBitmap(
- icon->ToImageSkia()->GetRepresentation(
- ui::GetImageScale(scale_factor)).sk_bitmap(),
+ icon->ToImageSkia()->GetRepresentation(scale_factor).sk_bitmap(),
false, &icon_data->data());
callback.Run(icon_data.get());
@@ -151,8 +150,8 @@
if (icon) {
scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
gfx::PNGCodec::EncodeBGRASkBitmap(
- icon->ToImageSkia()->GetRepresentation(
- ui::GetImageScale(details.scale_factor)).sk_bitmap(),
+ icon->ToImageSkia()->GetRepresentation(details.scale_factor)
+ .sk_bitmap(),
false,
&icon_data->data());
« no previous file with comments | « trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc ('k') | trunk/src/chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698