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

Unified Diff: chrome/browser/manifest/manifest_icon_selector.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 years, 11 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/manifest/manifest_icon_selector.cc
diff --git a/chrome/browser/manifest/manifest_icon_selector.cc b/chrome/browser/manifest/manifest_icon_selector.cc
index 26bbbe18f3f9ee47beda3df056a256fbdeee0a87..c44c29edd9e522d796ff29be20618d5d05aaf24e 100644
--- a/chrome/browser/manifest/manifest_icon_selector.cc
+++ b/chrome/browser/manifest/manifest_icon_selector.cc
@@ -166,12 +166,11 @@ std::vector<Manifest::Icon> ManifestIconSelector::FilterIconsByType(
GURL ManifestIconSelector::FindBestMatchingIcon(
const std::vector<Manifest::Icon>& unfiltered_icons,
const int ideal_icon_size_in_dp,
- const int minimum_icon_size_in_dp,
- const gfx::Screen* screen) {
+ const int minimum_icon_size_in_dp) {
DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
const float device_scale_factor =
- screen->GetPrimaryDisplay().device_scale_factor();
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
const int ideal_icon_size_in_px =
static_cast<int>(round(ideal_icon_size_in_dp * device_scale_factor));
const int minimum_icon_size_in_px =
« no previous file with comments | « chrome/browser/manifest/manifest_icon_selector.h ('k') | chrome/browser/manifest/manifest_icon_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698