Pass in extra parameters to WebApkBuilder#buildWebApkAsync()

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/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
@@ skipping 108 matching lines @@
       manifest.icons, ideal_icon_size_in_dp_, minimum_icon_size_in_dp_);
 
   // 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))) {
+                   this, icon_src))) {
     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_);
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
@@ skipping 89 matching lines @@
                           &icon_bitmap);
   }
 
   bool is_generated = false;
   if (weak_observer_) {
     icon_bitmap = weak_observer_->FinalizeLauncherIcon(icon_bitmap,
                                                        shortcut_info_.url,
                                                        &is_generated);
   }
 
+  GURL icon_url = is_generated ? GURL() : bitmap_result.icon_url;
   content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&AddToHomescreenDataFetcher::NotifyObserver,
-                 this,
-                 icon_bitmap,
-                 is_generated));
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&AddToHomescreenDataFetcher::NotifyObserver, this, icon_url,
+                 icon_bitmap));
 }
 

[dominickn, 2016/06/16 21:16:36]

Instead of passing icon_url through OnManifestIconFetched() and
NotifyObserver(), can shortcut_icon_url_ be set in CreateLauncherIcon() and
OnManifestIconFetched() since this is all on the same object?

This also makes it clearer that icon_url is plumbed through properly from
FetchFavicon()

-void AddToHomescreenDataFetcher::OnManifestIconFetched(const SkBitmap& icon) {
+void AddToHomescreenDataFetcher::OnManifestIconFetched(const GURL& icon_url,
+                                                       const SkBitmap& icon) {
   if (icon.drawsNothing()) {
     FetchFavicon();
     return;
   }
-  NotifyObserver(icon, false);
+  NotifyObserver(icon_url, icon);
 }
 
-void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& bitmap,
-                                                bool is_generated) {
+void AddToHomescreenDataFetcher::NotifyObserver(const GURL& icon_url,
+                                                const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
+  shortcut_icon_url_ = icon_url;
   shortcut_icon_ = bitmap;
-  shortcut_info_.is_icon_generated = is_generated;
   is_ready_ = true;
-  weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
+  weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_url_,
+                                  shortcut_icon_);
 }
 
 GURL AddToHomescreenDataFetcher::GetShortcutUrl(const GURL& actual_url) {
   GURL original_url =
       dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url);
 
   // If URL points to an offline content, get original URL.
   GURL online_url =
       offline_pages::OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
           web_contents()->GetBrowserContext(), original_url);
   if (online_url.is_valid())
     return online_url;
 
   return original_url;
 }