Allow ShortcutHelper to retrieve badge icon dimensions.

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"
@@ skipping 13 matching lines @@
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using content::Manifest;
 
 namespace {
 
-static int kIdealHomescreenIconSize = -1;
-static int kMinimumHomescreenIconSize = -1;
-static int kIdealSplashImageSize = -1;
-static int kMinimumSplashImageSize = -1;
+int g_ideal_homescreen_icon_size = -1;
+int g_minimum_homescreen_icon_size = -1;
+int g_ideal_splash_image_size = -1;
+int g_minimum_splash_image_size = -1;
+int g_ideal_badge_icon_size = -1;
 
-static int kDefaultRGBIconValue = 145;
+int g_default_rgb_icon_value = 145;
 
 // Retrieves and caches the ideal and minimum sizes of the Home screen icon
 // and the splash screen image.
 void GetHomescreenIconAndSplashImageSizes() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jintArray> java_size_array =
       Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env);
   std::vector<int> sizes;
   base::android::JavaIntArrayToIntVector(
       env, java_size_array.obj(), &sizes);
 
   // Check that the size returned is what is expected.
-  DCHECK(sizes.size() == 4);
+  DCHECK(sizes.size() == 5);
 
   // This ordering must be kept up to date with the Java ShortcutHelper.
-  kIdealHomescreenIconSize = sizes[0];
-  kMinimumHomescreenIconSize = sizes[1];
-  kIdealSplashImageSize = sizes[2];
-  kMinimumSplashImageSize = sizes[3];
+  g_ideal_homescreen_icon_size = sizes[0];
+  g_minimum_homescreen_icon_size = sizes[1];
+  g_ideal_splash_image_size = sizes[2];
+  g_minimum_splash_image_size = sizes[3];
+  g_ideal_badge_icon_size = sizes[4];
 
   // Try to ensure that the data returned is sane.
-  DCHECK(kMinimumHomescreenIconSize <= kIdealHomescreenIconSize);
-  DCHECK(kMinimumSplashImageSize <= kIdealSplashImageSize);
+  DCHECK(g_minimum_homescreen_icon_size <= g_ideal_homescreen_icon_size);
+  DCHECK(g_minimum_splash_image_size <= g_ideal_splash_image_size);
 }
 
 } // anonymous namespace
 
 // static
 void ShortcutHelper::AddToLauncherWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
@@ skipping 71 matching lines @@
   Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
                                   info.source);
 }
 
 void ShortcutHelper::ShowWebApkInstallInProgressToast() {
   Java_ShortcutHelper_showWebApkInstallInProgressToast(
       base::android::AttachCurrentThread());
 }
 
 int ShortcutHelper::GetIdealHomescreenIconSizeInPx() {
-  if (kIdealHomescreenIconSize == -1)
+  if (g_ideal_homescreen_icon_size == -1)
     GetHomescreenIconAndSplashImageSizes();
-  return kIdealHomescreenIconSize;
+  return g_ideal_homescreen_icon_size;
 }
 
 int ShortcutHelper::GetMinimumHomescreenIconSizeInPx() {
-  if (kMinimumHomescreenIconSize == -1)
+  if (g_minimum_homescreen_icon_size == -1)
     GetHomescreenIconAndSplashImageSizes();
-  return kMinimumHomescreenIconSize;
+  return g_minimum_homescreen_icon_size;
 }
 
 int ShortcutHelper::GetIdealSplashImageSizeInPx() {
-  if (kIdealSplashImageSize == -1)
+  if (g_ideal_splash_image_size == -1)
     GetHomescreenIconAndSplashImageSizes();
-  return kIdealSplashImageSize;
+  return g_ideal_splash_image_size;
 }
 
 int ShortcutHelper::GetMinimumSplashImageSizeInPx() {
-  if (kMinimumSplashImageSize == -1)
+  if (g_minimum_splash_image_size == -1)
     GetHomescreenIconAndSplashImageSizes();
-  return kMinimumSplashImageSize;
+  return g_minimum_splash_image_size;
+}
+
+int ShortcutHelper::GetIdealBadgeIconSizeInPx() {
+  if (g_ideal_badge_icon_size == -1)
+    GetHomescreenIconAndSplashImageSizes();
+  return g_ideal_badge_icon_size;
 }
 
 // static
 void ShortcutHelper::FetchSplashScreenImage(
     content::WebContents* web_contents,
     const GURL& image_url,
     const int ideal_splash_image_size_in_px,
     const int minimum_splash_image_size_in_px,
     const std::string& webapp_id) {
   // This is a fire and forget task. It is not vital for the splash screen image
@@ skipping 38 matching lines @@
       ScopedJavaLocalRef<jobject> java_bitmap =
           gfx::ConvertToJavaBitmap(&bitmap);
       result =
           Java_ShortcutHelper_createHomeScreenIconFromWebIcon(env, java_bitmap);
     }
   }
 
   if (result.is_null()) {
     ScopedJavaLocalRef<jstring> java_url =
         base::android::ConvertUTF8ToJavaString(env, url.spec());
-    SkColor mean_color = SkColorSetRGB(
-        kDefaultRGBIconValue, kDefaultRGBIconValue, kDefaultRGBIconValue);
+    SkColor mean_color =
+        SkColorSetRGB(g_default_rgb_icon_value, g_default_rgb_icon_value,
+                      g_default_rgb_icon_value);
 
     if (!bitmap.isNull())
       mean_color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
 
     *is_generated = true;
     result = Java_ShortcutHelper_generateHomeScreenIcon(
         env, java_url, SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }
 
@@ skipping 50 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }