Upstream: Add additional checks before creating a WebAPK after clicking "Add to Homescreen"

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/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/banners/app_banner_debug_log.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/banners/webapp_manifest_validator.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/load_flags.h"
 #include "third_party/WebKit/public/platform/WebDisplayMode.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 
 namespace {
 
 base::LazyInstance<base::TimeDelta> gTimeDeltaForTesting =
     LAZY_INSTANCE_INITIALIZER;
 int gCurrentRequestID = -1;
-const char kPngExtension[] = ".png";
-
-// The requirement for now is an image/png that is at least 144x144.
-const int kIconMinimumSize = 144;
-bool DoesManifestContainRequiredIcon(const content::Manifest& manifest) {
-  for (const auto& icon : manifest.icons) {
-    // The type field is optional. If it isn't present, fall back on checking
-    // the src extension, and allow the icon if the extension ends with png.
-    if (!base::EqualsASCII(icon.type.string(), "image/png") &&
-        !(icon.type.is_null() &&
-          base::EndsWith(icon.src.ExtractFileName(), kPngExtension,
-                         base::CompareCase::INSENSITIVE_ASCII)))
-      continue;
-
-    for (const auto& size : icon.sizes) {
-      if (size.IsEmpty()) // "any"
-        return true;
-      if (size.width() >= kIconMinimumSize && size.height() >= kIconMinimumSize)
-        return true;
-    }
-  }
-
-  return false;
-}
 
 }  // anonymous namespace
 
 namespace banners {
 
 // static
 base::Time AppBannerDataFetcher::GetCurrentTime() {
   return base::Time::Now() + gTimeDeltaForTesting.Get();
 }
 
@@ skipping 218 matching lines @@
       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,
                                           is_debug_mode_))
         return;
     }
   }
 
-  if (!IsManifestValidForWebApp(manifest, web_contents, is_debug_mode_)) {
+  OutputDeveloperMessageCode error_code = OutputDeveloperMessageCode::kNone;
+  if (!CheckManifest(manifest, &error_code)) {
+    OutputDeveloperNotShownMessage(web_contents, error_code, is_debug_mode_);
     Cancel();
     return;
   }
 
   // Since the manifest is valid, one of short name or name must be non-null.
   // Prefer name if it isn't null.
   manifest_url_ = manifest_url;
   manifest_ = manifest;
   app_title_ = (manifest_.name.is_null()) ? manifest_.short_name.string()
                                           : manifest_.name.string();
@@ skipping 97 matching lines @@
 
   app_icon_.reset(new SkBitmap(bitmap));
   event_request_id_ = ++gCurrentRequestID;
   web_contents->GetMainFrame()->Send(
       new ChromeViewMsg_AppBannerPromptRequest(
         web_contents->GetMainFrame()->GetRoutingID(),
         event_request_id_,
         GetBannerType()));
 }
 
+bool AppBannerDataFetcher::CheckManifest(const content::Manifest& manifest,
+                                         OutputDeveloperMessageCode* code) {
+  return webapp_manifest_validator::IsManifestGoodForWebapp(manifest, code);
+}
+
 bool AppBannerDataFetcher::IsWebAppInstalled(
     content::BrowserContext* browser_context,
     const GURL& start_url) {
   return false;
 }
 
 void AppBannerDataFetcher::RecordCouldShowBanner() {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
@@ skipping 18 matching lines @@
         OutputDeveloperMessageCode::kUserNavigatedBeforeBannerShown,
         is_debug_mode_);
     return false;
   }
   if (!web_contents) {
     return false; // We cannot show a message if |web_contents| is null
   }
   return true;
 }
 
-// static
-bool AppBannerDataFetcher::IsManifestValidForWebApp(
-    const content::Manifest& manifest,
-    content::WebContents* web_contents,
-    bool is_debug_mode) {
-  if (manifest.IsEmpty()) {
-    OutputDeveloperNotShownMessage(web_contents,
-                                   OutputDeveloperMessageCode::kManifestEmpty,
-                                   is_debug_mode);
-    return false;
-  }
-  if (!manifest.start_url.is_valid()) {
-    OutputDeveloperNotShownMessage(
-        web_contents, OutputDeveloperMessageCode::kStartURLNotValid,
-        is_debug_mode);
-    return false;
-  }
-  if ((manifest.name.is_null() || manifest.name.string().empty()) &&
-      (manifest.short_name.is_null() || manifest.short_name.string().empty())) {
-    OutputDeveloperNotShownMessage(
-        web_contents,
-        OutputDeveloperMessageCode::kManifestMissingNameOrShortName,
-        is_debug_mode);
-    return false;
-  }
-
-  // TODO(dominickn,mlamouri): when Chrome supports "minimal-ui", it should be
-  // accepted. If we accept it today, it would fallback to "browser" and make
-  // this check moot. See https://crbug.com/604390
-  if (manifest.display != blink::WebDisplayModeStandalone &&
-      manifest.display != blink::WebDisplayModeFullscreen) {
-    OutputDeveloperNotShownMessage(
-        web_contents,
-        OutputDeveloperMessageCode::kManifestDisplayStandaloneFullscreen,
-        is_debug_mode);
-    return false;
-  }
-
-  if (!DoesManifestContainRequiredIcon(manifest)) {
-    OutputDeveloperNotShownMessage(
-        web_contents, OutputDeveloperMessageCode::kManifestMissingSuitableIcon,
-        is_debug_mode);
-    return false;
-  }
-  return true;
-}
-
 }  // namespace banners