| 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 fe4e87420dae9954868bc736959c9279f8675810..3cc28110a712364b55f59d0882d320ef6c75e952 100644
|
| --- a/chrome/browser/banners/app_banner_data_fetcher.cc
|
| +++ b/chrome/browser/banners/app_banner_data_fetcher.cc
|
| @@ -106,8 +106,8 @@ void AppBannerDataFetcher::Start(const GURL& validated_url,
|
| transition_type_ = transition_type;
|
| validated_url_ = validated_url;
|
| referrer_.erase();
|
| - web_contents->HasManifest(
|
| - base::Bind(&AppBannerDataFetcher::OnDidHasManifest, this));
|
| + web_contents->GetManifest(
|
| + base::Bind(&AppBannerDataFetcher::OnDidGetManifest, this));
|
| }
|
|
|
| void AppBannerDataFetcher::Cancel() {
|
| @@ -270,21 +270,6 @@ void AppBannerDataFetcher::RecordDidShowBanner(const std::string& event_name) {
|
| web_contents->GetURL());
|
| }
|
|
|
| -void AppBannerDataFetcher::OnDidHasManifest(bool has_manifest) {
|
| - content::WebContents* web_contents = GetWebContents();
|
| -
|
| - if (!CheckFetcherIsStillAlive(web_contents) || !has_manifest) {
|
| - if (!has_manifest)
|
| - OutputDeveloperNotShownMessage(web_contents, kNoManifest, is_debug_mode_);
|
| -
|
| - Cancel();
|
| - return;
|
| - }
|
| -
|
| - web_contents->GetManifest(
|
| - base::Bind(&AppBannerDataFetcher::OnDidGetManifest, this));
|
| -}
|
| -
|
| void AppBannerDataFetcher::OnDidGetManifest(
|
| const GURL& manifest_url,
|
| const content::Manifest& manifest) {
|
| @@ -293,6 +278,11 @@ void AppBannerDataFetcher::OnDidGetManifest(
|
| Cancel();
|
| return;
|
| }
|
| + if (manifest_url.is_empty()) {
|
| + OutputDeveloperNotShownMessage(web_contents, kNoManifest, is_debug_mode_);
|
| + Cancel();
|
| + return;
|
| + }
|
| if (manifest.IsEmpty()) {
|
| OutputDeveloperNotShownMessage(web_contents, kManifestEmpty,
|
| is_debug_mode_);
|
|
|