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

Unified Diff: trunk/src/chrome/browser/ui/metro_pin_tab_helper_win.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
Index: trunk/src/chrome/browser/ui/metro_pin_tab_helper_win.cc
===================================================================
--- trunk/src/chrome/browser/ui/metro_pin_tab_helper_win.cc (revision 224498)
+++ trunk/src/chrome/browser/ui/metro_pin_tab_helper_win.cc (working copy)
@@ -85,7 +85,7 @@
SkColor dominant_color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
SkPaint paint;
paint.setColor(dominant_color);
- gfx::Canvas canvas(gfx::Size(kLogoWidth, kLogoHeight), 1.0f,
+ gfx::Canvas canvas(gfx::Size(kLogoWidth, kLogoHeight), ui::SCALE_FACTOR_100P,
true);
canvas.DrawRect(gfx::Rect(0, 0, kLogoWidth, kLogoHeight), paint);
@@ -381,7 +381,7 @@
if (favicon_tab_helper->FaviconIsValid()) {
// Only the 1x bitmap data is needed.
favicon = favicon_tab_helper->GetFavicon().AsImageSkia().GetRepresentation(
- 1.0f).sk_bitmap();
+ ui::SCALE_FACTOR_100P).sk_bitmap();
}
favicon_chooser_.reset(new FaviconChooser(this, title, url_str, favicon));
« no previous file with comments | « trunk/src/chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | trunk/src/chrome/browser/ui/toolbar/wrench_icon_painter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698