Index: chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc |
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc |
index 41f846b3dd459183c4c582764fe1ee6fedb68d9a..d81faa2d769256a7cb59640357a53c42ee7862c9 100644 |
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc |
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc |
@@ -48,17 +48,25 @@ GURL GetShortcutUrl(content::BrowserContext* browser_context, |
return dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url); |
} |
-InstallableParams ParamsToPerformInstallableCheck( |
+InstallableParams ParamsToPerformManifestAndIconFetch( |
int ideal_icon_size_in_px, |
- int minimum_icon_size_in_px, |
- int badge_size_in_px, |
- bool check_webapk_compatibility) { |
+ int minimum_icon_size_in_px) { |
InstallableParams params; |
params.ideal_primary_icon_size_in_px = ideal_icon_size_in_px; |
params.minimum_primary_icon_size_in_px = minimum_icon_size_in_px; |
- params.check_installable = check_webapk_compatibility; |
params.fetch_valid_primary_icon = true; |
+ return params; |
+} |
+ |
+InstallableParams ParamsToPerformInstallableCheck( |
+ int ideal_icon_size_in_px, |
+ int minimum_icon_size_in_px, |
+ int badge_size_in_px, |
+ bool check_webapk_compatibility) { |
+ InstallableParams params = ParamsToPerformManifestAndIconFetch( |
+ ideal_icon_size_in_px, minimum_icon_size_in_px); |
if (check_webapk_compatibility) { |
+ params.check_installable = check_webapk_compatibility; |
params.ideal_badge_icon_size_in_px = badge_size_in_px; |
params.minimum_badge_icon_size_in_px = badge_size_in_px; |
params.fetch_valid_badge_icon = true; |
@@ -82,6 +90,7 @@ AddToHomescreenDataFetcher::AddToHomescreenDataFetcher( |
content::BrowserThread::GetBlockingPool() |
->GetTaskRunnerWithShutdownBehavior( |
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)), |
+ installable_manager_(InstallableManager::FromWebContents(web_contents)), |
weak_observer_(observer), |
shortcut_info_(GetShortcutUrl(web_contents->GetBrowserContext(), |
web_contents->GetLastCommittedURL())), |
@@ -144,24 +153,16 @@ void AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo( |
break; |
} |
- InstallableManager::CreateForWebContents(web_contents()); |
- InstallableManager* manager = |
- InstallableManager::FromWebContents(web_contents()); |
- DCHECK(manager); |
- |
// Kick off a timeout for downloading data. If we haven't finished within the |
// timeout, fall back to using a dynamically-generated launcher icon. |
data_timeout_timer_.Start( |
FROM_HERE, base::TimeDelta::FromMilliseconds(kDataTimeoutInMilliseconds), |
base::Bind(&AddToHomescreenDataFetcher::OnDataTimedout, this)); |
- manager->GetData( |
- ParamsToPerformInstallableCheck(ideal_icon_size_in_px_, |
- minimum_icon_size_in_px_, |
- badge_size_in_px_, |
- check_webapk_compatibility_), |
- base::Bind(&AddToHomescreenDataFetcher::OnDidPerformInstallableCheck, |
- this)); |
+ installable_manager_->GetData( |
+ ParamsToPerformManifestAndIconFetch(ideal_icon_size_in_px_, |
+ minimum_icon_size_in_px_), |
+ base::Bind(&AddToHomescreenDataFetcher::OnDidGetManifestAndIcon, this)); |
} |
AddToHomescreenDataFetcher::~AddToHomescreenDataFetcher() { |
@@ -197,7 +198,42 @@ void AddToHomescreenDataFetcher::OnDataTimedout() { |
} |
badge_icon_.reset(); |
- CreateLauncherIcon(SkBitmap()); |
+ CreateLauncherIcon(raw_icon_); |
pkotwicz
2017/06/22 17:49:27
We should probably rename |raw_icon_| to |primary_
dominickn
2017/06/23 01:52:03
Done.
|
+} |
+ |
+void AddToHomescreenDataFetcher::OnDidGetManifestAndIcon( |
+ const InstallableData& data) { |
+ if (!web_contents() || !weak_observer_ || is_installable_check_complete_) |
+ return; |
+ |
+ if (!data.manifest.IsEmpty()) { |
+ base::RecordAction(base::UserMetricsAction("webapps.AddShortcut.Manifest")); |
+ shortcut_info_.UpdateFromManifest(data.manifest); |
+ shortcut_info_.manifest_url = data.manifest_url; |
+ |
+ if (data.primary_icon && !data.primary_icon->drawsNothing()) { |
pkotwicz
2017/06/22 17:49:27
Nit: Based on InstallableManager::OnIconFetched(),
dominickn
2017/06/23 01:52:03
Good point, can't even remember code that I wrote.
|
+ raw_icon_ = *data.primary_icon; |
+ shortcut_info_.best_primary_icon_url = data.primary_icon_url; |
+ |
+ // Save the splash screen URL for the later download. |
+ shortcut_info_.splash_image_url = |
+ content::ManifestIconSelector::FindBestMatchingIcon( |
+ data.manifest.icons, ideal_splash_image_size_in_px_, |
+ minimum_splash_image_size_in_px_, |
+ content::Manifest::Icon::IconPurpose::ANY); |
+ shortcut_info_.ideal_splash_image_size_in_px = |
+ ideal_splash_image_size_in_px_; |
+ shortcut_info_.minimum_splash_image_size_in_px = |
+ minimum_splash_image_size_in_px_; |
+ } |
+ } |
+ |
+ installable_manager_->GetData( |
+ ParamsToPerformInstallableCheck( |
+ ideal_icon_size_in_px_, minimum_icon_size_in_px_, badge_size_in_px_, |
+ check_webapk_compatibility_), |
+ base::Bind(&AddToHomescreenDataFetcher::OnDidPerformInstallableCheck, |
+ this)); |
} |
void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck( |
@@ -215,48 +251,24 @@ void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck( |
webapk_compatible = (data.error_code == NO_ERROR_DETECTED && |
AreWebManifestUrlsWebApkCompatible(data.manifest)); |
pkotwicz
2017/06/22 17:49:27
I think that it might be more intuitive if ParamsT
dominickn
2017/06/23 01:52:04
That won't work: setting check_installable to true
pkotwicz
2017/06/23 19:23:18
Sorry for the confusion. I meant it would be more
pkotwicz
2017/06/23 19:30:45
Oh, I see you have in fact made this change :)
dominickn
2017/06/26 02:39:16
When WebAPKs are enabled by default we'll always w
|
weak_observer_->OnDidDetermineWebApkCompatibility(webapk_compatible); |
- |
- if (webapk_compatible) { |
- // WebAPKs are wholly defined by the Web Manifest. Ignore the <meta> tag |
- // data received in OnDidGetWebApplicationInfo(). |
- shortcut_info_ = ShortcutInfo(GURL()); |
- } |
} |
- if (!data.manifest.IsEmpty()) { |
- base::RecordAction(base::UserMetricsAction("webapps.AddShortcut.Manifest")); |
- shortcut_info_.UpdateFromManifest(data.manifest); |
- shortcut_info_.manifest_url = data.manifest_url; |
- |
- if (webapk_compatible) { |
- shortcut_info_.UpdateSource(ShortcutInfo::SOURCE_ADD_TO_HOMESCREEN_PWA); |
+ if (webapk_compatible) { |
+ shortcut_info_.UpdateSource(ShortcutInfo::SOURCE_ADD_TO_HOMESCREEN_PWA); |
- if (data.badge_icon && !data.badge_icon->drawsNothing()) { |
- shortcut_info_.best_badge_icon_url = data.badge_icon_url; |
- badge_icon_ = *data.badge_icon; |
- } |
+ if (data.badge_icon && !data.badge_icon->drawsNothing()) { |
+ shortcut_info_.best_badge_icon_url = data.badge_icon_url; |
+ badge_icon_ = *data.badge_icon; |
} |
} |
- // Save the splash screen URL for the later download. |
- shortcut_info_.splash_image_url = |
- content::ManifestIconSelector::FindBestMatchingIcon( |
- data.manifest.icons, ideal_splash_image_size_in_px_, |
- minimum_splash_image_size_in_px_, |
- content::Manifest::Icon::IconPurpose::ANY); |
- shortcut_info_.ideal_splash_image_size_in_px = ideal_splash_image_size_in_px_; |
- shortcut_info_.minimum_splash_image_size_in_px = |
- minimum_splash_image_size_in_px_; |
- |
weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title); |
- if (data.primary_icon) { |
- shortcut_info_.best_primary_icon_url = data.primary_icon_url; |
- |
+ if (!raw_icon_.drawsNothing()) { |
if (webapk_compatible) |
- NotifyObserver(*data.primary_icon); |
+ NotifyObserver(raw_icon_); |
else |
- CreateLauncherIcon(*(data.primary_icon)); |
+ CreateLauncherIcon(raw_icon_); |
return; |
} |
@@ -306,35 +318,34 @@ SkBitmap AddToHomescreenDataFetcher::CreateLauncherIconFromFaviconInBackground( |
const favicon_base::FaviconRawBitmapResult& bitmap_result) { |
base::ThreadRestrictions::AssertIOAllowed(); |
- SkBitmap raw_icon; |
if (bitmap_result.is_valid()) { |
gfx::PNGCodec::Decode(bitmap_result.bitmap_data->front(), |
- bitmap_result.bitmap_data->size(), &raw_icon); |
+ bitmap_result.bitmap_data->size(), &raw_icon_); |
} |
shortcut_info_.best_primary_icon_url = bitmap_result.icon_url; |
- return CreateLauncherIconInBackground(raw_icon); |
+ return CreateLauncherIconInBackground(raw_icon_); |
} |
-void AddToHomescreenDataFetcher::CreateLauncherIcon(const SkBitmap& raw_icon) { |
+void AddToHomescreenDataFetcher::CreateLauncherIcon(const SkBitmap& icon) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
base::PostTaskAndReplyWithResult( |
background_task_runner_.get(), FROM_HERE, |
base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIconInBackground, |
- base::Unretained(this), raw_icon), |
+ base::Unretained(this), icon), |
base::Bind(&AddToHomescreenDataFetcher::NotifyObserver, |
base::RetainedRef(this))); |
} |
SkBitmap AddToHomescreenDataFetcher::CreateLauncherIconInBackground( |
- const SkBitmap& raw_icon) { |
+ const SkBitmap& icon) { |
base::ThreadRestrictions::AssertIOAllowed(); |
SkBitmap primary_icon; |
bool is_generated = false; |
if (weak_observer_) { |
primary_icon = weak_observer_->FinalizeLauncherIconInBackground( |
- raw_icon, shortcut_info_.url, &is_generated); |
+ icon, shortcut_info_.url, &is_generated); |
} |
if (is_generated) |