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

chrome/browser/android/banners/app_banner_data_fetcher_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_data_fetcher_android.h"
 
 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/ui/android/infobars/app_banner_infobar_android.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/screen.h"
 
 namespace banners {
 
 AppBannerDataFetcherAndroid::AppBannerDataFetcherAndroid(
     content::WebContents* web_contents,
     base::WeakPtr<Delegate> weak_delegate,
     int ideal_splash_image_size_in_dp,
-    int ideal_icon_size_in_dp)
-    : AppBannerDataFetcher(web_contents, weak_delegate, ideal_icon_size_in_dp),
-      ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp) {
+    int minimum_splash_image_size_in_dp,
+    int ideal_icon_size_in_dp,
+    int minimum_icon_size_in_dp)
+    : AppBannerDataFetcher(web_contents,
+                           weak_delegate,
+                           ideal_icon_size_in_dp,
+                           minimum_icon_size_in_dp),
+      ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp),
+      minimum_splash_image_size_in_dp_(minimum_splash_image_size_in_dp) {

[dominickn, 2015/09/11 00:29:58]

Nit: reorder the parameters so that the base class constructor arguments come
first, and then the additional splash screen arguments.

[Lalit Maganti, 2015/09/11 13:06:00]

Done.

 }
 
 AppBannerDataFetcherAndroid::~AppBannerDataFetcherAndroid() {
 }
 
 std::string AppBannerDataFetcherAndroid::GetBannerType() {
   return native_app_data_.is_null()
       ? AppBannerDataFetcher::GetBannerType() : "android";
 }
 
@@ skipping 14 matching lines @@
 }
 
 void AppBannerDataFetcherAndroid::FetchWebappSplashScreenImage(
     const std::string& webapp_id) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   GURL image_url = ManifestIconSelector::FindBestMatchingIcon(
       web_app_data().icons,
       ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_,
       gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
 
   ShortcutHelper::FetchSplashScreenImage(
-      web_contents, image_url, ideal_splash_image_size_in_dp_, webapp_id);
+      web_contents,
+      image_url,
+      ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_,
+      webapp_id);
 }
 
 void AppBannerDataFetcherAndroid::ShowBanner(const SkBitmap* icon,
                                              const base::string16& title,
                                              const std::string& referrer) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   infobars::InfoBar* infobar = nullptr;
   if (native_app_data_.is_null()) {
@@ skipping 17 matching lines @@
     if (infobar) {
       RecordDidShowBanner("AppBanner.NativeApp.Shown");
       TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_CREATED);
     }
   }
   InfoBarService::FromWebContents(web_contents)
       ->AddInfoBar(make_scoped_ptr(infobar));
 }
 
 }  // namespace banners