| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/shortcut_helper.h" | 5 #include "chrome/browser/android/shortcut_helper.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 if (!bitmap.isNull()) | 232 if (!bitmap.isNull()) |
| 233 mean_color = color_utils::CalculateKMeanColorOfBitmap(bitmap); | 233 mean_color = color_utils::CalculateKMeanColorOfBitmap(bitmap); |
| 234 | 234 |
| 235 *is_generated = true; | 235 *is_generated = true; |
| 236 result = Java_ShortcutHelper_generateHomeScreenIcon( | 236 result = Java_ShortcutHelper_generateHomeScreenIcon( |
| 237 env, java_url, SkColorGetR(mean_color), SkColorGetG(mean_color), | 237 env, java_url, SkColorGetR(mean_color), SkColorGetG(mean_color), |
| 238 SkColorGetB(mean_color)); | 238 SkColorGetB(mean_color)); |
| 239 } | 239 } |
| 240 | 240 |
| 241 return result.obj() | 241 return result.obj() |
| 242 ? gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result.obj())) | 242 ? gfx::CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(result)) |
| 243 : SkBitmap(); | 243 : SkBitmap(); |
| 244 } | 244 } |
| 245 | 245 |
| 246 // static | 246 // static |
| 247 std::string ShortcutHelper::QueryWebApkPackage(const GURL& url) { | 247 std::string ShortcutHelper::QueryWebApkPackage(const GURL& url) { |
| 248 JNIEnv* env = base::android::AttachCurrentThread(); | 248 JNIEnv* env = base::android::AttachCurrentThread(); |
| 249 ScopedJavaLocalRef<jstring> java_url = | 249 ScopedJavaLocalRef<jstring> java_url = |
| 250 base::android::ConvertUTF8ToJavaString(env, url.spec()); | 250 base::android::ConvertUTF8ToJavaString(env, url.spec()); |
| 251 ScopedJavaLocalRef<jstring> java_webapk_package_name = | 251 ScopedJavaLocalRef<jstring> java_webapk_package_name = |
| 252 Java_ShortcutHelper_queryWebApkPackage(env, java_url); | 252 Java_ShortcutHelper_queryWebApkPackage(env, java_url); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 DCHECK(jsplash_image_callback); | 286 DCHECK(jsplash_image_callback); |
| 287 base::Closure* splash_image_callback = | 287 base::Closure* splash_image_callback = |
| 288 reinterpret_cast<base::Closure*>(jsplash_image_callback); | 288 reinterpret_cast<base::Closure*>(jsplash_image_callback); |
| 289 splash_image_callback->Run(); | 289 splash_image_callback->Run(); |
| 290 delete splash_image_callback; | 290 delete splash_image_callback; |
| 291 } | 291 } |
| 292 | 292 |
| 293 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { | 293 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { |
| 294 return RegisterNativesImpl(env); | 294 return RegisterNativesImpl(env); |
| 295 } | 295 } |
| OLD | NEW |