Use exact pixel sizes instead of dip in webapp/WebAPK installability code

chrome/browser/android/banners/app_banner_manager_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/banners/app_banner_manager_android.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 53 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AppBannerManager_destroy(env, java_banner_manager_);
   java_banner_manager_.Reset();
 }
 
 base::Closure AppBannerManagerAndroid::FetchWebappSplashScreenImageCallback(
     const std::string& webapp_id) {
   content::WebContents* contents = web_contents();
   DCHECK(contents);
 
-  int ideal_splash_image_size_in_dp =
-      ShortcutHelper::GetIdealSplashImageSizeInDp();
-  int minimum_splash_image_size_in_dp =
-      ShortcutHelper::GetMinimumSplashImageSizeInDp();
+  int ideal_splash_image_size_in_px =
+      ShortcutHelper::GetIdealSplashImageSizeInPx();
+  int minimum_splash_image_size_in_px =
+      ShortcutHelper::GetMinimumSplashImageSizeInPx();
   GURL image_url = ManifestIconSelector::FindBestMatchingIcon(
-      manifest_.icons, ideal_splash_image_size_in_dp,
-      minimum_splash_image_size_in_dp);
+      manifest_.icons, ideal_splash_image_size_in_px,
+      minimum_splash_image_size_in_px);
 
   return base::Bind(&ShortcutHelper::FetchSplashScreenImage, contents,
-                    image_url, ideal_splash_image_size_in_dp,
-                    minimum_splash_image_size_in_dp, webapp_id);
+                    image_url, ideal_splash_image_size_in_px,
+                    minimum_splash_image_size_in_px, webapp_id);
 }
 
 const base::android::ScopedJavaGlobalRef<jobject>&
 AppBannerManagerAndroid::GetJavaBannerManager() const {
   return java_banner_manager_;
 }
 
 bool AppBannerManagerAndroid::IsActiveForTesting(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   return is_active();
 }
 
 bool AppBannerManagerAndroid::OnAppDetailsRetrieved(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& japp_data,
     const JavaParamRef<jstring>& japp_title,
     const JavaParamRef<jstring>& japp_package,
     const JavaParamRef<jstring>& jicon_url) {
   native_app_data_.Reset(japp_data);
   app_title_ = ConvertJavaStringToUTF16(env, japp_title);
   native_app_package_ = ConvertJavaStringToUTF8(env, japp_package);
   icon_url_ = GURL(ConvertJavaStringToUTF8(env, jicon_url));
 
   return ManifestIconDownloader::Download(
-      web_contents(), icon_url_, GetIdealIconSizeInDp(),
-      GetMinimumIconSizeInDp(),
+      web_contents(), icon_url_, GetIdealIconSizeInPx(),
+      GetMinimumIconSizeInPx(),
       base::Bind(&AppBannerManager::OnAppIconFetched, GetWeakPtr()));
 }
 
 void AppBannerManagerAndroid::RequestAppBanner(const GURL& validated_url,
                                                bool is_debug_mode) {
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!Java_AppBannerManager_isEnabledForTab(env, java_banner_manager_))
     return;
 
   AppBannerManager::RequestAppBanner(validated_url, is_debug_mode);
 }
 
 std::string AppBannerManagerAndroid::GetAppIdentifier() {
   return native_app_data_.is_null() ? AppBannerManager::GetAppIdentifier()
                                     : native_app_package_;
 }
 
 std::string AppBannerManagerAndroid::GetBannerType() {
   return native_app_data_.is_null() ? AppBannerManager::GetBannerType()
                                     : "play";
 }
 
-int AppBannerManagerAndroid::GetIdealIconSizeInDp() {
-  return ShortcutHelper::GetIdealHomescreenIconSizeInDp();
+int AppBannerManagerAndroid::GetIdealIconSizeInPx() {
+  return ShortcutHelper::GetIdealHomescreenIconSizeInPx();
 }
 
-int AppBannerManagerAndroid::GetMinimumIconSizeInDp() {
-  return ShortcutHelper::GetMinimumHomescreenIconSizeInDp();
+int AppBannerManagerAndroid::GetMinimumIconSizeInPx() {
+  return ShortcutHelper::GetMinimumHomescreenIconSizeInPx();
 }
 
 bool AppBannerManagerAndroid::IsWebAppInstalled(
     content::BrowserContext* browser_context,
     const GURL& start_url) {
   // Returns true if a WebAPK is installed. Does not check whether a non-WebAPK
   // web app is installed: this is detected by the content settings check in
   // AppBannerSettingsHelper::ShouldShowBanner (due to the lack of an API to
   // detect what is and isn't on the Android homescreen).
   // This method will still detect the presence of a WebAPK even if Chrome's
@@ skipping 94 matching lines @@
   if (!referrer.empty())
     referrer += "&";
   referrer += "playinline=chrome_inline";
 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, validated_url_.spec()));
   ScopedJavaLocalRef<jstring> jpackage(ConvertUTF8ToJavaString(env, id));
   ScopedJavaLocalRef<jstring> jreferrer(ConvertUTF8ToJavaString(env, referrer));
   Java_AppBannerManager_fetchAppDetails(env, java_banner_manager_, jurl,
                                         jpackage, jreferrer,
-                                        GetIdealIconSizeInDp());
+                                        GetIdealIconSizeInPx());
   return true;
 }
 
 void AppBannerManagerAndroid::CreateJavaBannerManager() {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_banner_manager_.Reset(
       Java_AppBannerManager_create(env, reinterpret_cast<intptr_t>(this)));
 }
 
 bool AppBannerManagerAndroid::CheckPlatformAndId(const std::string& platform,
@@ skipping 57 matching lines @@
 }
 
 // static
 void SetTotalEngagementToTrigger(JNIEnv* env,
                                  const JavaParamRef<jclass>& clazz,
                                  jdouble engagement) {
   AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
 }
 
 }  // namespace banners