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

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

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
Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index 49ab6bb0cfdf109ef4ecff3aff69c5b059a47e40..075ba88ceae0eabe8e7eb55071a72e7edfbd0d9b 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -15,11 +15,11 @@
#include "core/events/Event.h"
#include "core/events/EventQueue.h"
#include "modules/EventTargetModulesNames.h"
+#include "modules/payments/PaymentAddress.h"
#include "modules/payments/PaymentItem.h"
#include "modules/payments/PaymentRequestUpdateEvent.h"
#include "modules/payments/PaymentResponse.h"
#include "modules/payments/PaymentsValidators.h"
-#include "modules/payments/ShippingAddress.h"
#include "modules/payments/ShippingOption.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/wtf_array.h"
@@ -365,7 +365,7 @@ bool PaymentRequest::hasPendingActivity() const
return m_showResolver || m_completeResolver;
}
-void PaymentRequest::OnShippingAddressChange(mojom::blink::ShippingAddressPtr address)
+void PaymentRequest::OnShippingAddressChange(mojom::blink::PaymentAddressPtr address)
{
DCHECK(m_showResolver);
DCHECK(!m_completeResolver);
@@ -377,7 +377,7 @@ void PaymentRequest::OnShippingAddressChange(mojom::blink::ShippingAddressPtr ad
return;
}
- m_shippingAddress = new ShippingAddress(std::move(address));
+ m_shippingAddress = new PaymentAddress(std::move(address));
PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
event->setTarget(this);
event->setPaymentDetailsUpdater(this);
@@ -412,7 +412,7 @@ void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response
return;
}
- m_shippingAddress = new ShippingAddress(std::move(response->shipping_address));
+ m_shippingAddress = new PaymentAddress(std::move(response->shipping_address));
m_shippingOption = response->shipping_option_id;
}

Powered by Google App Engine
This is Rietveld 408576698