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

Unified Diff: content/renderer/service_worker/service_worker_type_converters.cc

Issue 2887713002: PaymentHandler: Merge PaymentAppRequest and PaymentRequestEvent. (Closed)
Patch Set: rebase Created 3 years, 7 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
« no previous file with comments | « content/browser/payments/payment_app_browsertest.cc ('k') | content/test/data/payments/payment_app.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/service_worker/service_worker_type_converters.cc
diff --git a/content/renderer/service_worker/service_worker_type_converters.cc b/content/renderer/service_worker/service_worker_type_converters.cc
index 5f05beeafcce0dc174e4a7ec519093d217cf74be..9899d952983e329fa9868fde7df3ca82480f4aeb 100644
--- a/content/renderer/service_worker/service_worker_type_converters.cc
+++ b/content/renderer/service_worker/service_worker_type_converters.cc
@@ -35,7 +35,12 @@ TypeConverter<blink::WebPaymentAppRequest,
Convert(const payments::mojom::PaymentAppRequestPtr& input) {
blink::WebPaymentAppRequest output;
- output.origin = blink::WebString::FromUTF8(input->origin.spec());
+ output.top_level_origin =
+ blink::WebString::FromUTF8(input->top_level_origin.spec());
+ output.payment_request_origin =
+ blink::WebString::FromUTF8(input->payment_request_origin.spec());
+ output.payment_request_id =
+ blink::WebString::FromUTF8(input->payment_request_id);
output.method_data =
blink::WebVector<blink::WebPaymentMethodData>(input->method_data.size());
@@ -53,7 +58,7 @@ TypeConverter<blink::WebPaymentAppRequest,
mojo::ConvertTo<blink::WebPaymentDetailsModifier>(input->modifiers[i]);
}
- output.option_id = blink::WebString::FromUTF8(input->option_id);
+ output.instrument_key = blink::WebString::FromUTF8(input->instrument_key);
return output;
}
« no previous file with comments | « content/browser/payments/payment_app_browsertest.cc ('k') | content/test/data/payments/payment_app.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698