webapps: allow callers of icon downloader/selector to specify a minimum size

chrome/browser/banners/app_banner_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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 56 matching lines @@
 }
 
 // static
 void AppBannerDataFetcher::SetTimeDeltaForTesting(int days) {
   gTimeDeltaForTesting = base::TimeDelta::FromDays(days);
 }
 
 AppBannerDataFetcher::AppBannerDataFetcher(
     content::WebContents* web_contents,
     base::WeakPtr<Delegate> delegate,
-    int ideal_icon_size_in_dp)
+    int ideal_icon_size_in_dp,
+    int minimum_icon_size_in_dp)
     : WebContentsObserver(web_contents),
+      weak_delegate_(delegate),
       ideal_icon_size_in_dp_(ideal_icon_size_in_dp),
-      weak_delegate_(delegate),
+      minimum_icon_size_in_dp_(minimum_icon_size_in_dp),
       is_active_(false),
       was_canceled_by_page_(false),
       page_requested_prompt_(false),
       event_request_id_(-1) {
+  DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
 }
 
 void AppBannerDataFetcher::Start(const GURL& validated_url,
                                  ui::PageTransition transition_type) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   is_active_ = true;
@@ skipping 218 matching lines @@
 
   OnHasServiceWorker(web_contents);
 }
 
 void AppBannerDataFetcher::OnHasServiceWorker(
     content::WebContents* web_contents) {
   GURL icon_url =
     ManifestIconSelector::FindBestMatchingIcon(
         web_app_data_.icons,
         ideal_icon_size_in_dp_,
+        minimum_icon_size_in_dp_,
         gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
 
   if (!FetchAppIcon(web_contents, icon_url)) {
     OutputDeveloperNotShownMessage(web_contents, kCannotDetermineBestIcon);
     Cancel();
   }
 }
 
 bool AppBannerDataFetcher::FetchAppIcon(content::WebContents* web_contents,
                                         const GURL& icon_url) {
   return ManifestIconDownloader::Download(
       web_contents,
       icon_url,
       ideal_icon_size_in_dp_,
+      minimum_icon_size_in_dp_,
       base::Bind(&AppBannerDataFetcher::OnAppIconFetched,
                  this));
 }
 
 void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
   if (!is_active_) return;
 
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
@@ skipping 77 matching lines @@
     return false;
   }
   if (!DoesManifestContainRequiredIcon(manifest)) {
     OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon);
     return false;
   }
   return true;
 }
 
 }  // namespace banners