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

Side by Side Diff: chrome/browser/android/payments/service_worker_payment_app_bridge.cc

Issue 2562873002: [PaymentApp] label field was changed to name field in PaymentAppOption. (Closed)
Patch Set: rebase Created 4 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | components/payments/payment_app.mojom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "components/payments/payment_app.mojom.h" 10 #include "components/payments/payment_app.mojom.h"
(...skipping 14 matching lines...) Expand all
25 // payment apps. 25 // payment apps.
26 std::string scope_url; 26 std::string scope_url;
27 std::vector<payments::mojom::PaymentAppManifestPtr> manifests; 27 std::vector<payments::mojom::PaymentAppManifestPtr> manifests;
28 28
29 ScopedJavaLocalRef<jobject> java_manifests = 29 ScopedJavaLocalRef<jobject> java_manifests =
30 Java_ServiceWorkerPaymentAppBridge_createManifestList(env); 30 Java_ServiceWorkerPaymentAppBridge_createManifestList(env);
31 for (const auto& manifest : manifests) { 31 for (const auto& manifest : manifests) {
32 ScopedJavaLocalRef<jobject> java_manifest = 32 ScopedJavaLocalRef<jobject> java_manifest =
33 Java_ServiceWorkerPaymentAppBridge_createAndAddManifest( 33 Java_ServiceWorkerPaymentAppBridge_createAndAddManifest(
34 env, java_manifests, ConvertUTF8ToJavaString(env, scope_url), 34 env, java_manifests, ConvertUTF8ToJavaString(env, scope_url),
35 ConvertUTF8ToJavaString(env, manifest->label), 35 ConvertUTF8ToJavaString(env, manifest->name),
36 manifest->icon ? ConvertUTF8ToJavaString(env, *manifest->icon) 36 manifest->icon ? ConvertUTF8ToJavaString(env, *manifest->icon)
37 : nullptr); 37 : nullptr);
38 for (const auto& option : manifest->options) { 38 for (const auto& option : manifest->options) {
39 ScopedJavaLocalRef<jobject> java_option = 39 ScopedJavaLocalRef<jobject> java_option =
40 Java_ServiceWorkerPaymentAppBridge_createAndAddOption( 40 Java_ServiceWorkerPaymentAppBridge_createAndAddOption(
41 env, java_manifest, ConvertUTF8ToJavaString(env, option->id), 41 env, java_manifest, ConvertUTF8ToJavaString(env, option->id),
42 ConvertUTF8ToJavaString(env, option->label), 42 ConvertUTF8ToJavaString(env, option->name),
43 option->icon ? ConvertUTF8ToJavaString(env, *option->icon) 43 option->icon ? ConvertUTF8ToJavaString(env, *option->icon)
44 : nullptr); 44 : nullptr);
45 for (const auto& enabled_method : option->enabled_methods) { 45 for (const auto& enabled_method : option->enabled_methods) {
46 Java_ServiceWorkerPaymentAppBridge_addEnabledMethod( 46 Java_ServiceWorkerPaymentAppBridge_addEnabledMethod(
47 env, java_option, ConvertUTF8ToJavaString(env, enabled_method)); 47 env, java_option, ConvertUTF8ToJavaString(env, enabled_method));
48 } 48 }
49 } 49 }
50 } 50 }
51 51
52 return java_manifests; 52 return java_manifests;
53 } 53 }
54 54
55 static void InvokePaymentApp(JNIEnv* env, 55 static void InvokePaymentApp(JNIEnv* env,
56 const JavaParamRef<jclass>& jcaller, 56 const JavaParamRef<jclass>& jcaller,
57 const JavaParamRef<jstring>& scopeUrl, 57 const JavaParamRef<jstring>& scopeUrl,
58 const JavaParamRef<jstring>& optionId, 58 const JavaParamRef<jstring>& optionId,
59 const JavaParamRef<jobject>& methodDataMap) { 59 const JavaParamRef<jobject>& methodDataMap) {
60 NOTIMPLEMENTED(); 60 NOTIMPLEMENTED();
61 } 61 }
62 62
63 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) { 63 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) {
64 return RegisterNativesImpl(env); 64 return RegisterNativesImpl(env);
65 } 65 }
OLDNEW
« no previous file with comments | « no previous file | components/payments/payment_app.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698