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

Unified Diff: chrome/browser/installable/installable_manager.cc

Issue 2611623003: Use exact pixel sizes instead of dip in webapp/WebAPK installability code (Closed)
Patch Set: Rebased version of pkotwicz@'s original patch Created 3 years, 12 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/installable/installable_manager.cc
diff --git a/chrome/browser/installable/installable_manager.cc b/chrome/browser/installable/installable_manager.cc
index 58066c13808b94f01a385bf16bd5fcf4c484b770..f7df24ded7763000fae4ed17ee79e48ad77afa7f 100644
--- a/chrome/browser/installable/installable_manager.cc
+++ b/chrome/browser/installable/installable_manager.cc
@@ -24,7 +24,7 @@ const char kPngExtension[] = ".png";
// factor of a Nexus 5 device (3x). For mobile and desktop platforms, a 144px
// icon is an approximate, appropriate lower bound. It is the currently
// advertised minimum icon size for triggering banners.
-// TODO(dominickn): consolidate with minimum_icon_size_in_dp across platforms.
+// TODO(dominickn): consolidate with minimum_icon_size_in_px across platforms.
const int kIconMinimumSizeInPx = 144;
// Returns true if |manifest| specifies a PNG icon >= 144x144px (or size "any").
@@ -115,12 +115,12 @@ void InstallableManager::GetData(const InstallableParams& params,
InstallableManager::IconProperty& InstallableManager::GetIcon(
const InstallableParams& params) {
- return icons_[{params.ideal_icon_size_in_dp, params.minimum_icon_size_in_dp}];
+ return icons_[{params.ideal_icon_size_in_px, params.minimum_icon_size_in_px}];
}
bool InstallableManager::IsIconFetched(const InstallableParams& params) const {
const auto it = icons_.find(
- {params.ideal_icon_size_in_dp, params.minimum_icon_size_in_dp});
+ {params.ideal_icon_size_in_px, params.minimum_icon_size_in_px});
return it != icons_.end() && it->second.fetched;
}
@@ -381,15 +381,15 @@ void InstallableManager::CheckAndFetchBestIcon() {
icon.fetched = true;
GURL icon_url = ManifestIconSelector::FindBestMatchingIcon(
- manifest().icons, params.ideal_icon_size_in_dp,
- params.minimum_icon_size_in_dp);
+ manifest().icons, params.ideal_icon_size_in_px,
+ params.minimum_icon_size_in_px);
if (icon_url.is_empty()) {
icon.error = NO_ACCEPTABLE_ICON;
} else {
bool can_download_icon = ManifestIconDownloader::Download(
- GetWebContents(), icon_url, params.ideal_icon_size_in_dp,
- params.minimum_icon_size_in_dp,
+ GetWebContents(), icon_url, params.ideal_icon_size_in_px,
+ params.minimum_icon_size_in_px,
base::Bind(&InstallableManager::OnAppIconFetched,
weak_factory_.GetWeakPtr(), icon_url));
if (can_download_icon)
« no previous file with comments | « chrome/browser/installable/installable_manager.h ('k') | chrome/browser/installable/installable_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698