| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/webapk/webapk_update_manager.h" | 5 #include "chrome/browser/android/webapk/webapk_update_manager.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 if (profile == nullptr) { | 69 if (profile == nullptr) { |
| 70 NOTREACHED() << "Profile not found."; | 70 NOTREACHED() << "Profile not found."; |
| 71 return; | 71 return; |
| 72 } | 72 } |
| 73 | 73 |
| 74 std::string id(ConvertJavaStringToUTF8(env, java_id)); | 74 std::string id(ConvertJavaStringToUTF8(env, java_id)); |
| 75 ShortcutInfo info(GURL(ConvertJavaStringToUTF8(env, java_start_url))); | 75 ShortcutInfo info(GURL(ConvertJavaStringToUTF8(env, java_start_url))); |
| 76 info.scope = GURL(ConvertJavaStringToUTF8(env, java_scope)); | 76 info.scope = GURL(ConvertJavaStringToUTF8(env, java_scope)); |
| 77 info.name = ConvertJavaStringToUTF16(env, java_name); | 77 info.name = ConvertJavaStringToUTF16(env, java_name); |
| 78 info.short_name = ConvertJavaStringToUTF16(env, java_short_name); | 78 info.short_name = ConvertJavaStringToUTF16(env, java_short_name); |
| 79 info.user_title = info.short_name; | |
| 80 info.display = static_cast<blink::WebDisplayMode>(java_display_mode); | 79 info.display = static_cast<blink::WebDisplayMode>(java_display_mode); |
| 81 info.orientation = | 80 info.orientation = |
| 82 static_cast<blink::WebScreenOrientationLockType>(java_orientation); | 81 static_cast<blink::WebScreenOrientationLockType>(java_orientation); |
| 83 info.theme_color = (int64_t)java_theme_color; | 82 info.theme_color = (int64_t)java_theme_color; |
| 84 info.background_color = (int64_t)java_background_color; | 83 info.background_color = (int64_t)java_background_color; |
| 85 info.best_primary_icon_url = | 84 info.best_primary_icon_url = |
| 86 GURL(ConvertJavaStringToUTF8(env, java_primary_icon_url)); | 85 GURL(ConvertJavaStringToUTF8(env, java_primary_icon_url)); |
| 87 info.best_badge_icon_url = | 86 info.best_badge_icon_url = |
| 88 GURL(ConvertJavaStringToUTF8(env, java_badge_icon_url)); | 87 GURL(ConvertJavaStringToUTF8(env, java_badge_icon_url)); |
| 89 info.manifest_url = GURL(ConvertJavaStringToUTF8(env, java_web_manifest_url)); | 88 info.manifest_url = GURL(ConvertJavaStringToUTF8(env, java_web_manifest_url)); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 119 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id, | 118 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id, |
| 120 WebApkInstallResult::FAILURE, false /* relax_updates */, | 119 WebApkInstallResult::FAILURE, false /* relax_updates */, |
| 121 "" /* webapk_package */)); | 120 "" /* webapk_package */)); |
| 122 return; | 121 return; |
| 123 } | 122 } |
| 124 install_service->UpdateAsync( | 123 install_service->UpdateAsync( |
| 125 info, primary_icon, badge_icon, webapk_package, java_webapk_version, | 124 info, primary_icon, badge_icon, webapk_package, java_webapk_version, |
| 126 icon_url_to_murmur2_hash, java_is_manifest_stale, | 125 icon_url_to_murmur2_hash, java_is_manifest_stale, |
| 127 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id)); | 126 base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id)); |
| 128 } | 127 } |
| OLD | NEW |