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

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 "base/basictypes.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 16 matching lines @@
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/screen.h"
 #include "url/gurl.h"
 
 using content::Manifest;
 
 AddToHomescreenDataFetcher::AddToHomescreenDataFetcher(
     content::WebContents* web_contents,
+    int ideal_icon_size_in_dp,
+    int minimum_icon_size_in_dp,
     int ideal_splash_image_size_in_dp,
-    int ideal_icon_size_in_dp,
+    int minimum_splash_image_size_in_dp,
     Observer* observer)
     : WebContentsObserver(web_contents),
       weak_observer_(observer),
       is_waiting_for_web_application_info_(false),
       is_icon_saved_(false),
       is_ready_(false),
       icon_timeout_timer_(false, false),
       shortcut_info_(dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(
                      web_contents->GetURL())),
+      ideal_icon_size_in_dp_(ideal_icon_size_in_dp),
+      minimum_icon_size_in_dp_(minimum_icon_size_in_dp),
       ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp),
-      ideal_icon_size_in_dp_(ideal_icon_size_in_dp) {
+      minimum_splash_image_size_in_dp_(minimum_splash_image_size_in_dp) {
+  DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
+  DCHECK(minimum_splash_image_size_in_dp <= ideal_splash_image_size_in_dp);
+
   // Send a message to the renderer to retrieve information about the page.
   is_waiting_for_web_application_info_ = true;
   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 42 matching lines @@
 
   if (!manifest.IsEmpty()) {
       content::RecordAction(
           base::UserMetricsAction("webapps.AddShortcut.Manifest"));
       shortcut_info_.UpdateFromManifest(manifest);
   }
 
   GURL icon_src = ManifestIconSelector::FindBestMatchingIcon(
       manifest.icons,
       ideal_icon_size_in_dp_,
+      minimum_icon_size_in_dp_,
       gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
 
   // If fetching the Manifest icon fails, fallback to the best favicon
   // for the page.
   if (!ManifestIconDownloader::Download(
         web_contents(),
         icon_src,
         ideal_icon_size_in_dp_,
+        minimum_icon_size_in_dp_,
         base::Bind(&AddToHomescreenDataFetcher::OnManifestIconFetched,
                    this))) {
     FetchFavicon();
   }
 
   // Save the splash screen URL for the later download.
   splash_screen_url_ = ManifestIconSelector::FindBestMatchingIcon(
       manifest.icons,
       ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_,
       gfx::Screen::GetScreenFor(web_contents()->GetNativeView()));
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   // Kick off a timeout for downloading the icon.  If an icon isn't set within
   // the timeout, fall back to using a dynamically-generated launcher icon.
   icon_timeout_timer_.Start(FROM_HERE,
                             base::TimeDelta::FromMilliseconds(3000),
                             base::Bind(
                                 &AddToHomescreenDataFetcher::OnFaviconFetched,
@@ skipping 19 matching lines @@
 AddToHomescreenDataFetcher::~AddToHomescreenDataFetcher() {
   DCHECK(!weak_observer_);
 }
 
 void AddToHomescreenDataFetcher::FetchSplashScreenImage(
     const std::string& webapp_id) {
   ShortcutHelper::FetchSplashScreenImage(
       web_contents(),
       splash_screen_url_,
       ideal_splash_image_size_in_dp_,
+      minimum_splash_image_size_in_dp_,
       webapp_id);
 }
 
 void AddToHomescreenDataFetcher::FetchFavicon() {
   if (!web_contents() || !weak_observer_) return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
   // Grab the best, largest icon we can find to represent this bookmark.
@@ skipping 70 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = bitmap;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }