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

Unified Diff: chrome/browser/ui/metro_pin_tab_helper_win.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename methods and vars to make image_scale more clear 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/metro_pin_tab_helper_win.cc
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc
index aa0f1d8b286a966d10e50ba22648c60c3be3adcb..9cdc5ab24ec5f5e3097a638ff7694a6b06ddf8f0 100644
--- a/chrome/browser/ui/metro_pin_tab_helper_win.cc
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc
@@ -85,7 +85,7 @@ bool CreateSiteSpecificLogo(const SkBitmap& bitmap,
SkColor dominant_color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
SkPaint paint;
paint.setColor(dominant_color);
- gfx::Canvas canvas(gfx::Size(kLogoWidth, kLogoHeight), ui::SCALE_FACTOR_100P,
+ gfx::Canvas canvas(gfx::Size(kLogoWidth, kLogoHeight), 1.0f,
true);
canvas.DrawRect(gfx::Rect(0, 0, kLogoWidth, kLogoHeight), paint);
@@ -383,7 +383,7 @@ void MetroPinTabHelper::TogglePinnedToStartScreen() {
if (favicon_tab_helper->FaviconIsValid()) {
// Only the 1x bitmap data is needed.
favicon = favicon_tab_helper->GetFavicon().AsImageSkia().GetRepresentation(
- ui::SCALE_FACTOR_100P).sk_bitmap();
+ 1.0f).sk_bitmap();
}
favicon_chooser_.reset(new FaviconChooser(this, title, url_str, favicon));

Powered by Google App Engine
This is Rietveld 408576698