chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java - Issue 2020913002: PaymentRequest: Rename ShippingAddress to PaymentAddress.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

Issue 2020913002: PaymentRequest: Rename ShippingAddress to PaymentAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 | « chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java ('k') | chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillAddressTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

index f5376e9b8385623e20dc0db943bf7ab8d61a4e6d..a2d212bceba2642dc35a93eaf39ff84713984c6d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -455,7 +455,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

assert option instanceof AutofillAddress;

mShippingAddressesSection.setSelectedItem(option);

if (mMerchantNeedsShippingAddress) {

- mClient.onShippingAddressChange(((AutofillAddress) option).toShippingAddress());

+ mClient.onShippingAddressChange(((AutofillAddress) option).toPaymentAddress());

}

} else if (optionType == PaymentRequestUI.TYPE_SHIPPING_OPTIONS) {

// This may update the line items.

@@ -571,7 +571,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

// AutofillAddress.

assert selectedShippingAddress instanceof AutofillAddress;

response.shippingAddress =

- ((AutofillAddress) selectedShippingAddress).toShippingAddress();

+ ((AutofillAddress) selectedShippingAddress).toPaymentAddress();

}

PaymentOption selectedShippingOption = mShippingOptionsSection.getSelectedItem();