Make minimum PWA icon size the same accross all device densities

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 31 matching lines @@
 // Looks up the original, online URL of the site requested.  The URL from the
 // WebContents may be a distilled article which is not appropriate for a home
 // screen shortcut.
 GURL GetShortcutUrl(content::BrowserContext* browser_context,
                     const GURL& actual_url) {
   return dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url);
 }
 
 InstallableParams ParamsToPerformInstallableCheck(
     int ideal_icon_size_in_px,
-    int minimum_icon_size_in_px,
     int badge_size_in_px,
     bool check_webapk_compatibility) {
   InstallableParams params;
   params.ideal_primary_icon_size_in_px = ideal_icon_size_in_px;
-  params.minimum_primary_icon_size_in_px = minimum_icon_size_in_px;
   params.check_installable = check_webapk_compatibility;
   params.fetch_valid_primary_icon = true;
   if (check_webapk_compatibility) {
     params.ideal_badge_icon_size_in_px = badge_size_in_px;
-    params.minimum_badge_icon_size_in_px = badge_size_in_px;
     params.fetch_valid_badge_icon = true;
   }
   return params;
 }
 
 }  // namespace
 
 AddToHomescreenDataFetcher::AddToHomescreenDataFetcher(
     content::WebContents* web_contents,
     int ideal_icon_size_in_px,
-    int minimum_icon_size_in_px,
     int ideal_splash_image_size_in_px,
-    int minimum_splash_image_size_in_px,
     int badge_size_in_px,
     bool check_webapk_compatibility,
     Observer* observer)
     : WebContentsObserver(web_contents),
       background_task_runner_(
           content::BrowserThread::GetBlockingPool()
               ->GetTaskRunnerWithShutdownBehavior(
                   base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)),
       weak_observer_(observer),
       shortcut_info_(GetShortcutUrl(web_contents->GetBrowserContext(),
                                     web_contents->GetLastCommittedURL())),
       ideal_icon_size_in_px_(ideal_icon_size_in_px),
-      minimum_icon_size_in_px_(minimum_icon_size_in_px),
       ideal_splash_image_size_in_px_(ideal_splash_image_size_in_px),
-      minimum_splash_image_size_in_px_(minimum_splash_image_size_in_px),
       badge_size_in_px_(badge_size_in_px),
       check_webapk_compatibility_(check_webapk_compatibility),
       is_waiting_for_web_application_info_(true),
       is_installable_check_complete_(false),
       is_icon_saved_(false),
       is_ready_(false) {
-  DCHECK(minimum_icon_size_in_px <= ideal_icon_size_in_px);
-  DCHECK(minimum_splash_image_size_in_px <= ideal_splash_image_size_in_px);
-
   // Send a message to the renderer to retrieve information about the page.
   Send(new ChromeViewMsg_GetWebApplicationInfo(routing_id()));
 }
 
 void AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo(
     const WebApplicationInfo& received_web_app_info) {
   is_waiting_for_web_application_info_ = false;
   if (!web_contents() || !weak_observer_)
     return;
 
@@ skipping 38 matching lines @@
   DCHECK(manager);
 
   // Kick off a timeout for downloading data. If we haven't finished within the
   // timeout, fall back to using a dynamically-generated launcher icon.
   data_timeout_timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(kDataTimeoutInMilliseconds),
       base::Bind(&AddToHomescreenDataFetcher::OnDataTimedout, this));
 
   manager->GetData(
       ParamsToPerformInstallableCheck(ideal_icon_size_in_px_,
-                                      minimum_icon_size_in_px_,
                                       badge_size_in_px_,
                                       check_webapk_compatibility_),
       base::Bind(&AddToHomescreenDataFetcher::OnDidPerformInstallableCheck,
                  this));
 }
 
 AddToHomescreenDataFetcher::~AddToHomescreenDataFetcher() {
   DCHECK(!weak_observer_);
 }
 
@@ skipping 62 matching lines @@
       if (data.badge_icon && !data.badge_icon->drawsNothing()) {
         shortcut_info_.best_badge_icon_url = data.badge_icon_url;
         badge_icon_ = *data.badge_icon;
       }
     }
   }
 
   // Save the splash screen URL for the later download.
   shortcut_info_.splash_image_url = ManifestIconSelector::FindBestMatchingIcon(
       data.manifest.icons, ideal_splash_image_size_in_px_,
-      minimum_splash_image_size_in_px_,
+      InstallableManager::GetMinimumIconSizeInPx(),
       content::Manifest::Icon::IconPurpose::ANY);
   shortcut_info_.ideal_splash_image_size_in_px = ideal_splash_image_size_in_px_;
-  shortcut_info_.minimum_splash_image_size_in_px =
-      minimum_splash_image_size_in_px_;
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   if (data.primary_icon) {
     shortcut_info_.best_primary_icon_url = data.primary_icon_url;
 
     CreateLauncherIcon(*(data.primary_icon));
     return;
   }
 
@@ skipping 83 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& primary_icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   primary_icon_ = primary_icon;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, primary_icon_, badge_icon_);
 }