Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: chrome/browser/android/shortcut_helper.cc

Issue 1421973005: Follow Material spec for icons when adding web apps to home screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dan's comments Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3e0ddc291b631fd78d4db5445fd95c7d6b94201e 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -36,7 +36,7 @@ static int kDefaultRGBIconValue = 145;
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(
@@ -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_createHomeScreenIconFromWebIcon(
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));
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698