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

Unified Diff: chrome/browser/android/payments/service_worker_payment_app_bridge.cc

Issue 2665583002: PaymentApp: Rename PaymentAppRequestData to PaymentAppRequest. (Closed)
Patch Set: android Created 3 years, 11 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/payments/service_worker_payment_app_bridge.cc
diff --git a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
index cf5391cb7bf282f8bac5eefd08e9632688d9572d..e95f392f3352fc4699f2f69534584232cae26946 100644
--- a/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
+++ b/chrome/browser/android/payments/service_worker_payment_app_bridge.cc
@@ -23,8 +23,8 @@ using base::android::JavaParamRef;
using base::android::JavaRef;
using base::android::ScopedJavaGlobalRef;
using base::android::ScopedJavaLocalRef;
-using payments::mojom::PaymentAppRequestData;
-using payments::mojom::PaymentAppRequestDataPtr;
+using payments::mojom::PaymentAppRequest;
+using payments::mojom::PaymentAppRequestPtr;
using payments::mojom::PaymentCurrencyAmount;
using payments::mojom::PaymentDetailsModifier;
using payments::mojom::PaymentDetailsModifierPtr;
@@ -96,10 +96,10 @@ static void InvokePaymentApp(JNIEnv* env,
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
- PaymentAppRequestDataPtr data = PaymentAppRequestData::New();
+ PaymentAppRequestPtr appRequest = PaymentAppRequest::New();
jam 2017/01/30 18:05:00 ditto
- data->optionId = ConvertJavaStringToUTF8(env, joption_id);
- data->origin = GURL(ConvertJavaStringToUTF8(env, jorigin));
+ appRequest->optionId = ConvertJavaStringToUTF8(env, joption_id);
+ appRequest->origin = GURL(ConvertJavaStringToUTF8(env, jorigin));
for (jsize i = 0; i < env->GetArrayLength(jmethod_data); i++) {
ScopedJavaLocalRef<jobject> element(
@@ -115,18 +115,18 @@ static void InvokePaymentApp(JNIEnv* env,
env,
Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData(
env, element));
- data->methodData.push_back(std::move(methodData));
+ appRequest->methodData.push_back(std::move(methodData));
}
- data->total = PaymentItem::New();
- data->total->label = ConvertJavaStringToUTF8(
+ appRequest->total = PaymentItem::New();
+ appRequest->total->label = ConvertJavaStringToUTF8(
env,
Java_ServiceWorkerPaymentAppBridge_getLabelFromPaymentItem(env, jtotal));
- data->total->amount = PaymentCurrencyAmount::New();
- data->total->amount->currency = ConvertJavaStringToUTF8(
+ appRequest->total->amount = PaymentCurrencyAmount::New();
+ appRequest->total->amount->currency = ConvertJavaStringToUTF8(
env, Java_ServiceWorkerPaymentAppBridge_getCurrencyFromPaymentItem(
env, jtotal));
- data->total->amount->value = ConvertJavaStringToUTF8(
+ appRequest->total->amount->value = ConvertJavaStringToUTF8(
env,
Java_ServiceWorkerPaymentAppBridge_getValueFromPaymentItem(env, jtotal));
@@ -164,11 +164,12 @@ static void InvokePaymentApp(JNIEnv* env,
Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData(
env, jmodifier_method_data));
- data->modifiers.push_back(std::move(modifier));
+ appRequest->modifiers.push_back(std::move(modifier));
}
content::PaymentAppProvider::GetInstance()->InvokePaymentApp(
- web_contents->GetBrowserContext(), registration_id, std::move(data));
+ web_contents->GetBrowserContext(), registration_id,
+ std::move(appRequest));
}
bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) {
« no previous file with comments | « no previous file | components/payments/payment_app.mojom » ('j') | content/browser/payments/payment_app_provider_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698