Use related_applications manifest fields when showing native app banners

chrome/browser/banners/app_banner_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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/render_messages.h"
 #include "components/infobars/core/infobar.h"
 #include "components/rappor/rappor_utils.h"
@@ skipping 205 matching lines @@
       GetCurrentTime());
   rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                           event_name,
                                           web_contents->GetURL());
   banners::TrackDisplayEvent(DISPLAY_EVENT_CREATED);
 }
 
 void AppBannerDataFetcher::OnDidGetManifest(
     const content::Manifest& manifest) {
   content::WebContents* web_contents = GetWebContents();
-  if (!is_active_ || !web_contents) {
+  if (!is_active_ || !web_contents || manifest.IsEmpty()) {
     Cancel();
     return;
   }
 
-  if (!IsManifestValid(manifest)) {
-    if (!weak_delegate_.get()->OnInvalidManifest(this))
-      Cancel();
+  if (manifest.prefer_related_applications &&
+      manifest.related_applications.size()) {
+    for (const auto& application : manifest.related_applications) {
+      std::string platform = base::UTF16ToUTF8(application.platform.string());
+      std::string id = base::UTF16ToUTF8(application.id.string());
+      if (weak_delegate_->HandleNonWebApp(platform, application.url, id))
+        return;
+    }
+  }
+
+  if (!IsManifestValidForWebApp(manifest)) {
+    Cancel();
     return;
   }
 
   banners::TrackDisplayEvent(DISPLAY_EVENT_BANNER_REQUESTED);
 
   web_app_data_ = manifest;
   app_title_ = web_app_data_.name.string();
 
   // Check to see if there is a single service worker controlling this page
   // and the manifest's start url.
@@ skipping 77 matching lines @@
 
 bool AppBannerDataFetcher::CheckIfShouldShowBanner() {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   return AppBannerSettingsHelper::ShouldShowBanner(
       web_contents, validated_url_, GetAppIdentifier(), GetCurrentTime());
 }
 
 // static
-bool AppBannerDataFetcher::IsManifestValid(
+bool AppBannerDataFetcher::IsManifestValidForWebApp(
     const content::Manifest& manifest) {
   if (manifest.IsEmpty())
     return false;
   if (!manifest.start_url.is_valid())
     return false;
   if (manifest.name.is_null() && manifest.short_name.is_null())
     return false;
   if (!DoesManifestContainRequiredIcon(manifest))
     return false;
   return true;
 }
 
 }  // namespace banners