| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 webapk::TrackGooglePlayInstallState(state); | 150 webapk::TrackGooglePlayInstallState(state); |
| 151 return; | 151 return; |
| 152 } | 152 } |
| 153 AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap); | 153 AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap); |
| 154 } | 154 } |
| 155 | 155 |
| 156 // static | 156 // static |
| 157 void ShortcutHelper::InstallWebApkWithSkBitmap( | 157 void ShortcutHelper::InstallWebApkWithSkBitmap( |
| 158 content::WebContents* web_contents, | 158 content::WebContents* web_contents, |
| 159 const ShortcutInfo& info, | 159 const ShortcutInfo& info, |
| 160 const SkBitmap& icon_bitmap, | 160 const SkBitmap& primary_icon_bitmap, |
| 161 const SkBitmap& badge_icon_bitmap, |
| 161 const WebApkInstallService::FinishCallback& callback) { | 162 const WebApkInstallService::FinishCallback& callback) { |
| 162 WebApkInstallService::Get(web_contents->GetBrowserContext()) | 163 WebApkInstallService::Get(web_contents->GetBrowserContext()) |
| 163 ->InstallAsync(info, icon_bitmap, callback); | 164 ->InstallAsync(info, primary_icon_bitmap, badge_icon_bitmap, callback); |
| 164 // Don't record metric for users who install WebAPKs via "unsigned sources" | 165 // Don't record metric for users who install WebAPKs via "unsigned sources" |
| 165 // flow. | 166 // flow. |
| 166 if (ChromeWebApkHost::GetGooglePlayInstallState() == | 167 if (ChromeWebApkHost::GetGooglePlayInstallState() == |
| 167 GooglePlayInstallState::SUPPORTED) { | 168 GooglePlayInstallState::SUPPORTED) { |
| 168 webapk::TrackGooglePlayInstallState(GooglePlayInstallState::SUPPORTED); | 169 webapk::TrackGooglePlayInstallState(GooglePlayInstallState::SUPPORTED); |
| 169 } | 170 } |
| 170 } | 171 } |
| 171 | 172 |
| 172 void ShortcutHelper::ShowWebApkInstallInProgressToast() { | 173 void ShortcutHelper::ShowWebApkInstallInProgressToast() { |
| 173 Java_ShortcutHelper_showWebApkInstallInProgressToast( | 174 Java_ShortcutHelper_showWebApkInstallInProgressToast( |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 413 | 414 |
| 414 ShortcutHelper::WebApkInfoCallback* webapk_list_callback = | 415 ShortcutHelper::WebApkInfoCallback* webapk_list_callback = |
| 415 reinterpret_cast<ShortcutHelper::WebApkInfoCallback*>(jcallback_pointer); | 416 reinterpret_cast<ShortcutHelper::WebApkInfoCallback*>(jcallback_pointer); |
| 416 webapk_list_callback->Run(webapk_list); | 417 webapk_list_callback->Run(webapk_list); |
| 417 delete webapk_list_callback; | 418 delete webapk_list_callback; |
| 418 } | 419 } |
| 419 | 420 |
| 420 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { | 421 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) { |
| 421 return RegisterNativesImpl(env); | 422 return RegisterNativesImpl(env); |
| 422 } | 423 } |
| OLD | NEW |