Chromium Code Reviews| Index: chrome/browser/android/shortcut_helper.cc |
| diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc |
| index c39462a32ef556f9aa02ce89660df20018ab7429..ddfb1576d570b6511211871148d4a706a478f652 100644 |
| --- a/chrome/browser/android/shortcut_helper.cc |
| +++ b/chrome/browser/android/shortcut_helper.cc |
| @@ -170,10 +170,12 @@ SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap, |
| *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_generateHomescreenIconFromWebIcon( |
|
mlamouri (slow - plz ping)
2015/10/29 19:04:51
nit: please, don't use the term |generate|, we hav
newt (away)
2015/10/29 19:42:28
Good point. Renamed to createHomescreenIconFromWeb
|
| env, base::android::GetApplicationContext(), java_bitmap.obj()); |
| } |
| } |
| @@ -188,7 +190,7 @@ SkBitmap ShortcutHelper::FinalizeLauncherIcon(const SkBitmap& bitmap, |
| 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)); |