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

Unified Diff: chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc

Issue 1420743002: Web app: set a flag on the Intent if the icon was generated by Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@splashscreen-even-more-tests
Patch Set: locally tested 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
Index: chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
index 15a22276d94c4b386c3a893f473a5d4968eb83da..f5f704d929b9e2840effb881d2716360a9c9181b 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
@@ -1,4 +1,5 @@
// Copyright 2015 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.
@@ -85,32 +86,11 @@ void AddToHomescreenDialogHelper::Destroy(JNIEnv* env, jobject obj) {
SkBitmap AddToHomescreenDialogHelper::FinalizeLauncherIcon(
const SkBitmap& bitmap,
- const GURL& url) {
+ const GURL& url,
+ bool* generated) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
- // Determine a single color to use for the favicon if the favicon that is
- // returned it is too low quality.
- SkColor color = color_utils::CalculateKMeanColorOfBitmap(bitmap);
- int dominant_red = SkColorGetR(color);
- int dominant_green = SkColorGetG(color);
- int dominant_blue = SkColorGetB(color);
-
- // Make the icon acceptable for the Android launcher.
- JNIEnv* env = base::android::AttachCurrentThread();
- ScopedJavaLocalRef<jstring> java_url =
- base::android::ConvertUTF8ToJavaString(env, url.spec());
- ScopedJavaLocalRef<jobject> java_bitmap;
- if (bitmap.getSize())
- java_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
-
- base::android::ScopedJavaLocalRef<jobject> ref =
- Java_AddToHomescreenDialogHelper_finalizeLauncherIcon(env,
- java_url.obj(),
- java_bitmap.obj(),
- dominant_red,
- dominant_green,
- dominant_blue);
- return gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(ref.obj()));
+ return ShortcutHelper::FinalizeLauncherIcon(bitmap, url, generated);
}
void AddToHomescreenDialogHelper::AddShortcut(JNIEnv* env,

Powered by Google App Engine
This is Rietveld 408576698