webapps: allow callers of icon downloader/selector to specify a minimum size

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "url/gurl.h"
 
 using content::Manifest;
 
+namespace {
+static int kIdealIconSize = -1;
+static int kMinimumIconSize = -1;
+static int kIdealSplashImageSize = -1;
+static int kMinimumSplashImageSize = -1;
+
+// Retrieves and caches the ideal and minimum sizes of the home screen icon

[gone, 2015/09/14 23:03:32]

"launcher" or "Home screen"

[Lalit Maganti, 2015/09/15 16:59:03]

Done.

+// and the splash screen image.
+void GetIconAndSplashImageSizes() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jintArray> java_size_array =
+      Java_ShortcutHelper_getIconAndSplashImageSizes(env,
+          base::android::GetApplicationContext());
+  std::vector<int> size_vector;
+  base::android::JavaIntArrayToIntVector(
+      env, java_size_array.obj(), &size_vector);
+
+  // This ordering must be kept up to date with the Java ShortcutHelper.

[gone, 2015/09/14 23:03:32]

Assert that the array size is correct to loosely enforce this requirement.

[Lalit Maganti, 2015/09/15 16:59:03]

Done.

+  kIdealIconSize = size_vector[0];
+  kMinimumIconSize = size_vector[1];
+  kIdealSplashImageSize = size_vector[2];
+  kMinimumSplashImageSize = size_vector[3];
+}
+} // namespace
+
 // static
 void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Send the data to the Java side to create the shortcut.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
@@ skipping 19 matching lines @@
       java_name.obj(),
       java_short_name.obj(),
       java_bitmap.obj(),
       info.display == blink::WebDisplayModeStandalone,
       info.orientation,
       info.source,
       info.theme_color,
       info.background_color);
 }
 
+int ShortcutHelper::GetIdealSplashImageSizeInDp() {
+  if (kIdealIconSize == -1)
+    GetIconAndSplashImageSizes();
+  return kIdealIconSize;
+}
+
+int ShortcutHelper::GetMinimumSplashImageSizeInDp() {
+  if (kMinimumIconSize == -1)
+    GetIconAndSplashImageSizes();
+  return kMinimumIconSize;
+}
+
+int ShortcutHelper::GetIdealIconSizeInDp() {
+  if (kIdealSplashImageSize == -1)
+    GetIconAndSplashImageSizes();
+  return kIdealSplashImageSize;
+}
+
+int ShortcutHelper::GetMinimumIconSizeInDp() {
+  if (kMinimumSplashImageSize == -1)
+    GetIconAndSplashImageSizes();
+  return kMinimumSplashImageSize;
+}
+
 // static
 void ShortcutHelper::FetchSplashScreenImage(
     content::WebContents* web_contents,
     const GURL& image_url,
     const int ideal_splash_image_size_in_dp,
+    const int minimum_splash_image_size_in_dp,
     const std::string& webapp_id) {
   // This is a fire and forget task. It is not vital for the splash screen image
   // to be downloaded so if the downloader returns false there is no fallback.
   ManifestIconDownloader::Download(
       web_contents,
       image_url,
       ideal_splash_image_size_in_dp,
+      minimum_splash_image_size_in_dp,
       base::Bind(&ShortcutHelper::StoreWebappData, webapp_id));
 }
 
 // static
 void ShortcutHelper::StoreWebappData(
     const std::string& webapp_id,
     const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
   Java_ShortcutHelper_storeWebappData(
       env,
       base::android::GetApplicationContext(),
       java_webapp_id.obj(),
       java_splash_image.obj());
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }