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/payments/service_worker_payment_app_bridge.h" | 5 #include "chrome/browser/android/payments/service_worker_payment_app_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
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" |
11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
12 #include "chrome/browser/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "components/payments/mojom/payment_app.mojom.h" | 13 #include "components/payments/mojom/payment_app.mojom.h" |
14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/browser/payment_app_provider.h" | 15 #include "content/public/browser/payment_app_provider.h" |
16 #include "content/public/browser/stored_payment_instrument.h" | 16 #include "content/public/browser/stored_payment_instrument.h" |
17 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
18 #include "jni/ServiceWorkerPaymentAppBridge_jni.h" | 18 #include "jni/ServiceWorkerPaymentAppBridge_jni.h" |
| 19 #include "ui/gfx/android/java_bitmap.h" |
19 | 20 |
20 namespace { | 21 namespace { |
21 | 22 |
22 using ::base::android::AttachCurrentThread; | 23 using ::base::android::AttachCurrentThread; |
23 using ::base::android::ConvertJavaStringToUTF8; | 24 using ::base::android::ConvertJavaStringToUTF8; |
24 using ::base::android::ConvertUTF8ToJavaString; | 25 using ::base::android::ConvertUTF8ToJavaString; |
25 using ::base::android::JavaParamRef; | 26 using ::base::android::JavaParamRef; |
26 using ::base::android::JavaRef; | 27 using ::base::android::JavaRef; |
27 using ::base::android::ScopedJavaGlobalRef; | 28 using ::base::android::ScopedJavaGlobalRef; |
28 using ::base::android::ScopedJavaLocalRef; | 29 using ::base::android::ScopedJavaLocalRef; |
(...skipping 13 matching lines...) Expand all Loading... |
42 JNIEnv* env = AttachCurrentThread(); | 43 JNIEnv* env = AttachCurrentThread(); |
43 | 44 |
44 for (const auto& app_info : apps) { | 45 for (const auto& app_info : apps) { |
45 ScopedJavaLocalRef<jobject> java_instruments = | 46 ScopedJavaLocalRef<jobject> java_instruments = |
46 Java_ServiceWorkerPaymentAppBridge_createInstrumentList(env); | 47 Java_ServiceWorkerPaymentAppBridge_createInstrumentList(env); |
47 for (const auto& instrument : app_info.second) { | 48 for (const auto& instrument : app_info.second) { |
48 Java_ServiceWorkerPaymentAppBridge_addInstrument( | 49 Java_ServiceWorkerPaymentAppBridge_addInstrument( |
49 env, java_instruments, jweb_contents, instrument->registration_id, | 50 env, java_instruments, jweb_contents, instrument->registration_id, |
50 ConvertUTF8ToJavaString(env, instrument->instrument_key), | 51 ConvertUTF8ToJavaString(env, instrument->instrument_key), |
51 ConvertUTF8ToJavaString(env, instrument->name), | 52 ConvertUTF8ToJavaString(env, instrument->name), |
52 ToJavaArrayOfStrings(env, instrument->enabled_methods)); | 53 ToJavaArrayOfStrings(env, instrument->enabled_methods), |
| 54 gfx::ConvertToJavaBitmap(instrument->icon.get())); |
53 } | 55 } |
54 Java_ServiceWorkerPaymentAppBridge_onPaymentAppCreated( | 56 Java_ServiceWorkerPaymentAppBridge_onPaymentAppCreated( |
55 env, java_instruments, jweb_contents, jcallback); | 57 env, java_instruments, jweb_contents, jcallback); |
56 } | 58 } |
57 Java_ServiceWorkerPaymentAppBridge_onAllPaymentAppsCreated(env, jcallback); | 59 Java_ServiceWorkerPaymentAppBridge_onAllPaymentAppsCreated(env, jcallback); |
58 } | 60 } |
59 | 61 |
60 void OnPaymentAppInvoked(const JavaRef<jobject>& jweb_contents, | 62 void OnPaymentAppInvoked(const JavaRef<jobject>& jweb_contents, |
61 const JavaRef<jobject>& jcallback, | 63 const JavaRef<jobject>& jcallback, |
62 payments::mojom::PaymentAppResponsePtr app_response) { | 64 payments::mojom::PaymentAppResponsePtr app_response) { |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 content::PaymentAppProvider::GetInstance()->InvokePaymentApp( | 183 content::PaymentAppProvider::GetInstance()->InvokePaymentApp( |
182 web_contents->GetBrowserContext(), registration_id, std::move(event_data), | 184 web_contents->GetBrowserContext(), registration_id, std::move(event_data), |
183 base::Bind(&OnPaymentAppInvoked, | 185 base::Bind(&OnPaymentAppInvoked, |
184 ScopedJavaGlobalRef<jobject>(env, jweb_contents), | 186 ScopedJavaGlobalRef<jobject>(env, jweb_contents), |
185 ScopedJavaGlobalRef<jobject>(env, jcallback))); | 187 ScopedJavaGlobalRef<jobject>(env, jcallback))); |
186 } | 188 } |
187 | 189 |
188 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) { | 190 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) { |
189 return RegisterNativesImpl(env); | 191 return RegisterNativesImpl(env); |
190 } | 192 } |
OLD | NEW |