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

Unified Diff: ios/chrome/browser/ui/payments/payment_request_coordinator.mm

Issue 2924663003: [Payment Request] Moves PaymentRequestViewController to :payments_ui (Closed)
Patch Set: Created 3 years, 6 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: ios/chrome/browser/ui/payments/payment_request_coordinator.mm
diff --git a/ios/chrome/browser/ui/payments/payment_request_coordinator.mm b/ios/chrome/browser/ui/payments/payment_request_coordinator.mm
index 08653996b2f54a9cd29f7469664f4ee42077b8c9..1ada0661e8a015ebd439f2f82c76cde9aae48298 100644
--- a/ios/chrome/browser/ui/payments/payment_request_coordinator.mm
+++ b/ios/chrome/browser/ui/payments/payment_request_coordinator.mm
@@ -55,10 +55,10 @@ using ::payments::data_util::GetPaymentAddressFromAutofillProfile;
- (void)start {
_mediator =
- [[PaymentRequestMediator alloc] initWithBrowserState:_browserState];
+ [[PaymentRequestMediator alloc] initWithBrowserState:_browserState
+ paymentRequest:_paymentRequest];
- _viewController = [[PaymentRequestViewController alloc]
- initWithPaymentRequest:_paymentRequest];
+ _viewController = [[PaymentRequestViewController alloc] init];
[_viewController setPageFavicon:_pageFavicon];
[_viewController setPageTitle:_pageTitle];
[_viewController setPageHost:_pageHost];
@@ -124,6 +124,7 @@ using ::payments::data_util::GetPaymentAddressFromAutofillProfile;
- (void)updatePaymentDetails:(web::PaymentDetails)paymentDetails {
BOOL totalValueChanged =
(_paymentRequest->payment_details().total != paymentDetails.total);
+ [_mediator setTotalValueChanged:totalValueChanged];
_paymentRequest->UpdatePaymentDetails(paymentDetails);
if (_paymentRequest->shipping_options().empty()) {
@@ -138,29 +139,25 @@ using ::payments::data_util::GetPaymentAddressFromAutofillProfile;
[_viewController loadModel];
[[_viewController collectionView] reloadData];
} else {
- // Update the payment summary section.
- [_viewController
- updatePaymentSummaryWithTotalValueChanged:totalValueChanged];
+ // Update the payment summary item.
+ [_viewController updatePaymentSummaryItem];
if (_shippingAddressSelectionCoordinator) {
- // Set the selected shipping address and update the selected shipping
- // address in the payment request summary view.
+ // Set the selected shipping address.
_paymentRequest->set_selected_shipping_profile(_pendingShippingAddress);
_pendingShippingAddress = nil;
- [_viewController updateSelectedShippingAddressUI];
// Dismiss the shipping address selection view.
[_shippingAddressSelectionCoordinator stop];
_shippingAddressSelectionCoordinator = nil;
} else if (_shippingOptionSelectionCoordinator) {
- // Update the selected shipping option in the payment request summary
- // view. The updated selection is already reflected in |_paymentRequest|.
- [_viewController updateSelectedShippingOptionUI];
-
// Dismiss the shipping option selection view.
[_shippingOptionSelectionCoordinator stop];
_shippingOptionSelectionCoordinator = nil;
}
+
+ // Update the Shipping section in the payment request summary view.
+ [_viewController updateShippingSection];
}
}
@@ -260,7 +257,7 @@ using ::payments::data_util::GetPaymentAddressFromAutofillProfile;
- (void)paymentItemsDisplayCoordinatorDidReturn:
(PaymentItemsDisplayCoordinator*)coordinator {
// Clear the 'Updated' label on the payment summary item, if there is one.
- [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
+ [_viewController updatePaymentSummaryItem];
[_itemsDisplayCoordinator stop];
_itemsDisplayCoordinator = nil;
@@ -278,7 +275,7 @@ contactInfoSelectionCoordinator:(ContactInfoSelectionCoordinator*)coordinator
didSelectContactProfile:(autofill::AutofillProfile*)contactProfile {
_paymentRequest->set_selected_contact_profile(contactProfile);
- [_viewController updateSelectedContactInfoUI];
+ [_viewController updateContactInfoSection];
[_contactInfoSelectionCoordinator stop];
_contactInfoSelectionCoordinator = nil;
@@ -306,7 +303,7 @@ contactInfoSelectionCoordinator:(ContactInfoSelectionCoordinator*)coordinator
- (void)shippingAddressSelectionCoordinatorDidReturn:
(ShippingAddressSelectionCoordinator*)coordinator {
// Clear the 'Updated' label on the payment summary item, if there is one.
- [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
+ [_viewController updatePaymentSummaryItem];
[_shippingAddressSelectionCoordinator stop];
_shippingAddressSelectionCoordinator = nil;
@@ -325,7 +322,7 @@ contactInfoSelectionCoordinator:(ContactInfoSelectionCoordinator*)coordinator
- (void)shippingOptionSelectionCoordinatorDidReturn:
(ShippingAddressSelectionCoordinator*)coordinator {
// Clear the 'Updated' label on the payment summary item, if there is one.
- [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
+ [_viewController updatePaymentSummaryItem];
[_shippingOptionSelectionCoordinator stop];
_shippingOptionSelectionCoordinator = nil;
@@ -338,10 +335,10 @@ contactInfoSelectionCoordinator:(ContactInfoSelectionCoordinator*)coordinator
didSelectPaymentMethod:(autofill::CreditCard*)creditCard {
_paymentRequest->set_selected_credit_card(creditCard);
- [_viewController updateSelectedPaymentMethodUI];
+ [_viewController updatePaymentMethodSection];
// Clear the 'Updated' label on the payment summary item, if there is one.
- [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
+ [_viewController updatePaymentSummaryItem];
[_methodSelectionCoordinator stop];
_methodSelectionCoordinator = nil;
@@ -350,7 +347,7 @@ contactInfoSelectionCoordinator:(ContactInfoSelectionCoordinator*)coordinator
- (void)paymentMethodSelectionCoordinatorDidReturn:
(PaymentMethodSelectionCoordinator*)coordinator {
// Clear the 'Updated' label on the payment summary item, if there is one.
- [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
+ [_viewController updatePaymentSummaryItem];
[_methodSelectionCoordinator stop];
_methodSelectionCoordinator = nil;

Powered by Google App Engine
This is Rietveld 408576698