AppBanner: add requirement for an 144x144 image/png icon.

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 2014 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/android/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
+#include "base/strings/string_util.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/android/manifest_icon_selector.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/shortcut_info.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/infobars/infobar_service.h"
 #include "chrome/browser/metrics/rappor/sampling.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 14 matching lines @@
 #include "net/base/load_flags.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/screen.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 
 namespace {
+
 const char kBannerTag[] = "google-play-id";
 base::TimeDelta gTimeDeltaForTesting;
 bool gDisableSecureCheckForTesting = false;
-}  // namespace
+
+// The requirement for now is an image/png that is at least 144x144.
+bool DoesManifestContainRequiredIcon(const content::Manifest& manifest) {
+  for (const auto& icon : manifest.icons) {
+    if (EqualsASCII(icon.type.string(), "image/png"))
+      continue;
+
+    for (const auto& size : icon.sizes) {
+      if (size.IsEmpty()) // "any"
+        return true;
+      if (size.width() >= 144 && size.height() >= 144)

[gone, 2015/02/20 17:36:41]

Make 144 a constant up above.

+        return true;
+    }
+  }
+
+  return false;
+}
+
+}  // anonymous namespace
 
 namespace banners {
 
 // Fetches a bitmap and deletes itself when completed.
 class AppBannerManager::BannerBitmapFetcher
     : public chrome::BitmapFetcher,
       public chrome::BitmapFetcherDelegate {
  public:
   BannerBitmapFetcher(const GURL& image_url,
                       banners::AppBannerManager* manager);
@@ skipping 83 matching lines @@
   web_contents()->GetManifest(base::Bind(&AppBannerManager::OnDidGetManifest,
                                          weak_factory_.GetWeakPtr()));
 }
 
 void AppBannerManager::OnDidGetManifest(const content::Manifest& manifest) {
   if (web_contents()->IsBeingDestroyed())
     return;
 
   if (manifest.IsEmpty()
       || !manifest.start_url.is_valid()
-      || (manifest.name.is_null() && manifest.short_name.is_null())) {
+      || (manifest.name.is_null() && manifest.short_name.is_null())
+      || !DoesManifestContainRequiredIcon(manifest)) {
     // No usable manifest, see if there is a play store meta tag.
     Send(new ChromeViewMsg_RetrieveMetaTagContent(routing_id(),
                                                   validated_url_,
                                                   kBannerTag));
     return;
   }
 
   banners::TrackDisplayEvent(DISPLAY_EVENT_BANNER_REQUESTED);
 
   web_app_data_ = manifest;
@@ skipping 218 matching lines @@
 void DisableSecureSchemeCheckForTesting(JNIEnv* env, jclass clazz) {
   gDisableSecureCheckForTesting = true;
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners