Follow Material spec for icons when adding web apps to home screen.

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 18 matching lines @@
 static int kIdealSplashImageSize = -1;
 static int kMinimumSplashImageSize = -1;
 
 static int kDefaultRGBIconValue = 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,
+      Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env,
           base::android::GetApplicationContext());
   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);
 
   // This ordering must be kept up to date with the Java ShortcutHelper.
   kIdealHomescreenIconSize = sizes[0];
@@ skipping 113 matching lines @@
 SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap,
                                               const GURL& url,
                                               bool* is_generated) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> result;
   *is_generated = false;
 
   if (!bitmap.isNull()) {
-    ScopedJavaLocalRef<jobject> java_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
     if (Java_ShortcutHelper_isIconLargeEnoughForLauncher(
-        env, base::android::GetApplicationContext(), java_bitmap.obj())) {
-      result = Java_ShortcutHelper_modifyIconForLauncher(
+            env, base::android::GetApplicationContext(), bitmap.width(),
+            bitmap.height())) {
+      ScopedJavaLocalRef<jobject> java_bitmap =
+          gfx::ConvertToJavaBitmap(&bitmap);
+      result = Java_ShortcutHelper_createHomeScreenIconFromWebIcon(
           env, base::android::GetApplicationContext(), java_bitmap.obj());
     }
   }
 
   if (result.is_null()) {
     ScopedJavaLocalRef<jstring> java_url =
         base::android::ConvertUTF8ToJavaString(env, url.spec());
     SkColor mean_color = SkColorSetRGB(
         kDefaultRGBIconValue, kDefaultRGBIconValue, kDefaultRGBIconValue);
 
     if (!bitmap.isNull())
       mean_color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
 
     *is_generated = true;
-    result = Java_ShortcutHelper_generateLauncherIcon(
+    result = Java_ShortcutHelper_generateHomeScreenIcon(
         env, base::android::GetApplicationContext(), java_url.obj(),
         SkColorGetR(mean_color), SkColorGetG(mean_color),
         SkColorGetB(mean_color));
   }
 
   return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj()));
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }