Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3174)

Unified Diff: chrome/browser/banners/app_banner_data_fetcher.cc

Issue 2064943002: Pass in extra parameters to WebApkBuilder#buildWebApkAsync() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into webapk_manifest Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/banners/app_banner_data_fetcher.cc
diff --git a/chrome/browser/banners/app_banner_data_fetcher.cc b/chrome/browser/banners/app_banner_data_fetcher.cc
index 48589c0116663d3e26774bee7ecd8002a1145b9f..b1bac06d4e3b08903af7511a9df8717ee54987ed 100644
--- a/chrome/browser/banners/app_banner_data_fetcher.cc
+++ b/chrome/browser/banners/app_banner_data_fetcher.cc
@@ -202,7 +202,7 @@ void AppBannerDataFetcher::OnBannerPromptReply(
FOR_EACH_OBSERVER(Observer, observer_list_,
OnDecidedWhetherToShow(this, true));
- ShowBanner(app_icon_.get(), app_title_, referrer);
+ ShowBanner(app_icon_url_, app_icon_.get(), app_title_, referrer);
is_active_ = false;
}
@@ -375,10 +375,11 @@ bool AppBannerDataFetcher::FetchAppIcon(content::WebContents* web_contents,
ideal_icon_size_in_dp_,
minimum_icon_size_in_dp_,
base::Bind(&AppBannerDataFetcher::OnAppIconFetched,
- this));
+ this, icon_url));
}
-void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
+void AppBannerDataFetcher::OnAppIconFetched(const GURL& icon_url,
+ const SkBitmap& bitmap) {
if (!is_active_) return;
content::WebContents* web_contents = GetWebContents();
@@ -401,6 +402,7 @@ void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
return;
}
+ app_icon_url_ = icon_url;
dominickn 2016/06/16 21:16:36 Can this be done in FetchAppIcon(), so that it doe
app_icon_.reset(new SkBitmap(bitmap));
event_request_id_ = ++gCurrentRequestID;
web_contents->GetMainFrame()->Send(

Powered by Google App Engine
This is Rietveld 408576698