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

Side by Side Diff: ios/chrome/browser/payments/payment_request_coordinator.mm

Issue 2701923003: [Payment Request] Error message screen (Closed)
Patch Set: Addressed comments Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/payments/payment_request_coordinator.h" 5 #import "ios/chrome/browser/payments/payment_request_coordinator.h"
6 6
7 #include <unordered_set> 7 #include <unordered_set>
8 #include <vector> 8 #include <vector>
9 9
10 #import "base/ios/weak_nsobject.h" 10 #import "base/ios/weak_nsobject.h"
11 #include "base/mac/objc_property_releaser.h" 11 #include "base/mac/objc_property_releaser.h"
12 #include "base/mac/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/sys_string_conversions.h" 15 #include "base/strings/sys_string_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "components/autofill/core/browser/autofill_client.h" 17 #include "components/autofill/core/browser/autofill_client.h"
18 #include "components/autofill/core/browser/autofill_data_util.h" 18 #include "components/autofill/core/browser/autofill_data_util.h"
19 #include "components/autofill/core/browser/autofill_profile.h" 19 #include "components/autofill/core/browser/autofill_profile.h"
20 #include "components/autofill/core/browser/credit_card.h" 20 #include "components/autofill/core/browser/credit_card.h"
21 #include "components/autofill/core/browser/field_types.h" 21 #include "components/autofill/core/browser/field_types.h"
22 #include "components/autofill/core/browser/payments/full_card_request.h" 22 #include "components/autofill/core/browser/payments/full_card_request.h"
23 #include "components/autofill/core/browser/personal_data_manager.h" 23 #include "components/autofill/core/browser/personal_data_manager.h"
24 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl .h" 24 #include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl .h"
25 #include "components/strings/grit/components_strings.h"
25 #include "ios/chrome/browser/application_context.h" 26 #include "ios/chrome/browser/application_context.h"
26 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 27 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
27 #include "ios/chrome/browser/payments/payment_request.h" 28 #include "ios/chrome/browser/payments/payment_request.h"
28 #include "ios/chrome/browser/payments/payment_request_util.h" 29 #include "ios/chrome/browser/payments/payment_request_util.h"
29 #include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h" 30 #include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h"
31 #include "ui/base/l10n/l10n_util.h"
30 32
31 // The unmask prompt UI for Payment Request. 33 // The unmask prompt UI for Payment Request.
32 class PRCardUnmaskPromptViewBridge 34 class PRCardUnmaskPromptViewBridge
33 : public autofill::CardUnmaskPromptViewBridge { 35 : public autofill::CardUnmaskPromptViewBridge {
34 public: 36 public:
35 explicit PRCardUnmaskPromptViewBridge( 37 explicit PRCardUnmaskPromptViewBridge(
36 autofill::CardUnmaskPromptController* controller, 38 autofill::CardUnmaskPromptController* controller,
37 UIViewController* base_view_controller) 39 UIViewController* base_view_controller)
38 : autofill::CardUnmaskPromptViewBridge(controller), 40 : autofill::CardUnmaskPromptViewBridge(controller),
39 base_view_controller_(base_view_controller){}; 41 base_view_controller_(base_view_controller){};
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 UIViewController* base_view_controller_; // Weak. 114 UIViewController* base_view_controller_; // Weak.
113 autofill::CardUnmaskPromptControllerImpl unmask_controller_; 115 autofill::CardUnmaskPromptControllerImpl unmask_controller_;
114 116
115 DISALLOW_COPY_AND_ASSIGN(FullCardRequester); 117 DISALLOW_COPY_AND_ASSIGN(FullCardRequester);
116 }; 118 };
117 119
118 @interface PaymentRequestCoordinator () { 120 @interface PaymentRequestCoordinator () {
119 base::WeakNSProtocol<id<PaymentRequestCoordinatorDelegate>> _delegate; 121 base::WeakNSProtocol<id<PaymentRequestCoordinatorDelegate>> _delegate;
120 base::scoped_nsobject<UINavigationController> _navigationController; 122 base::scoped_nsobject<UINavigationController> _navigationController;
121 base::scoped_nsobject<PaymentRequestViewController> _viewController; 123 base::scoped_nsobject<PaymentRequestViewController> _viewController;
124 base::scoped_nsobject<PaymentRequestErrorCoordinator> _errorCoordinator;
122 base::scoped_nsobject<PaymentItemsDisplayCoordinator> 125 base::scoped_nsobject<PaymentItemsDisplayCoordinator>
123 _itemsDisplayCoordinator; 126 _itemsDisplayCoordinator;
124 base::scoped_nsobject<ShippingAddressSelectionCoordinator> 127 base::scoped_nsobject<ShippingAddressSelectionCoordinator>
125 _shippingAddressSelectionCoordinator; 128 _shippingAddressSelectionCoordinator;
126 base::scoped_nsobject<ShippingOptionSelectionCoordinator> 129 base::scoped_nsobject<ShippingOptionSelectionCoordinator>
127 _shippingOptionSelectionCoordinator; 130 _shippingOptionSelectionCoordinator;
128 base::scoped_nsobject<PaymentMethodSelectionCoordinator> 131 base::scoped_nsobject<PaymentMethodSelectionCoordinator>
129 _methodSelectionCoordinator; 132 _methodSelectionCoordinator;
130 133
131 // Receiver of the full credit card details. Also displays the unmask prompt 134 // Receiver of the full credit card details. Also displays the unmask prompt
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 188 }
186 189
187 - (void)stop { 190 - (void)stop {
188 [[_navigationController presentingViewController] 191 [[_navigationController presentingViewController]
189 dismissViewControllerAnimated:YES 192 dismissViewControllerAnimated:YES
190 completion:nil]; 193 completion:nil];
191 _itemsDisplayCoordinator.reset(); 194 _itemsDisplayCoordinator.reset();
192 _shippingAddressSelectionCoordinator.reset(); 195 _shippingAddressSelectionCoordinator.reset();
193 _shippingOptionSelectionCoordinator.reset(); 196 _shippingOptionSelectionCoordinator.reset();
194 _methodSelectionCoordinator.reset(); 197 _methodSelectionCoordinator.reset();
198 _errorCoordinator.reset();
199 _viewController.reset();
195 _navigationController.reset(); 200 _navigationController.reset();
196 _viewController.reset();
197 } 201 }
198 202
199 - (void)sendPaymentResponse { 203 - (void)sendPaymentResponse {
200 DCHECK(_paymentRequest->selected_credit_card()); 204 DCHECK(_paymentRequest->selected_credit_card());
201 autofill::CreditCard* card = _paymentRequest->selected_credit_card(); 205 autofill::CreditCard* card = _paymentRequest->selected_credit_card();
202 _fullCardRequester = base::MakeUnique<FullCardRequester>( 206 _fullCardRequester = base::MakeUnique<FullCardRequester>(
203 self, _navigationController, _browserState); 207 self, _navigationController, _browserState);
204 _fullCardRequester->GetFullCard(card, _autofillManager); 208 _fullCardRequester->GetFullCard(card, _autofillManager);
205 } 209 }
206 210
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // view. The updated selection is already reflected in |_paymentRequest|. 270 // view. The updated selection is already reflected in |_paymentRequest|.
267 [_viewController updateSelectedShippingOptionUI]; 271 [_viewController updateSelectedShippingOptionUI];
268 272
269 // Dismiss the shipping option selection view. 273 // Dismiss the shipping option selection view.
270 [_shippingOptionSelectionCoordinator stop]; 274 [_shippingOptionSelectionCoordinator stop];
271 _shippingOptionSelectionCoordinator.reset(); 275 _shippingOptionSelectionCoordinator.reset();
272 } 276 }
273 } 277 }
274 } 278 }
275 279
280 - (void)displayErrorWithCallback:(void (^)())callback {
281 _errorCoordinator.reset([[PaymentRequestErrorCoordinator alloc]
282 initWithBaseViewController:_navigationController]);
283 [_errorCoordinator setCallback:callback];
284 [_errorCoordinator setDelegate:self];
285
286 [_errorCoordinator start];
287 }
288
276 #pragma mark - PaymentRequestViewControllerDelegate 289 #pragma mark - PaymentRequestViewControllerDelegate
277 290
278 - (void)paymentRequestViewControllerDidCancel: 291 - (void)paymentRequestViewControllerDidCancel:
279 (PaymentRequestViewController*)controller { 292 (PaymentRequestViewController*)controller {
280 [_delegate paymentRequestCoordinatorDidCancel:self]; 293 [_delegate paymentRequestCoordinatorDidCancel:self];
281 } 294 }
282 295
283 - (void)paymentRequestViewControllerDidConfirm: 296 - (void)paymentRequestViewControllerDidConfirm:
284 (PaymentRequestViewController*)controller { 297 (PaymentRequestViewController*)controller {
285 [self sendPaymentResponse]; 298 [self sendPaymentResponse];
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 - (void)paymentRequestViewControllerDidSelectPaymentMethodItem: 333 - (void)paymentRequestViewControllerDidSelectPaymentMethodItem:
321 (PaymentRequestViewController*)controller { 334 (PaymentRequestViewController*)controller {
322 _methodSelectionCoordinator.reset([[PaymentMethodSelectionCoordinator alloc] 335 _methodSelectionCoordinator.reset([[PaymentMethodSelectionCoordinator alloc]
323 initWithBaseViewController:_viewController]); 336 initWithBaseViewController:_viewController]);
324 [_methodSelectionCoordinator setPaymentRequest:_paymentRequest]; 337 [_methodSelectionCoordinator setPaymentRequest:_paymentRequest];
325 [_methodSelectionCoordinator setDelegate:self]; 338 [_methodSelectionCoordinator setDelegate:self];
326 339
327 [_methodSelectionCoordinator start]; 340 [_methodSelectionCoordinator start];
328 } 341 }
329 342
343 #pragma mark - PaymentRequestErrorCoordinatorDelegate
344
345 - (void)paymentRequestErrorCoordinatorDidDismiss:
346 (PaymentRequestErrorCoordinator*)coordinator {
347 void (^callback)() = coordinator.callback;
lpromero 2017/02/21 16:51:07 Nit: Use ProceduralBlock.
Moe 2017/02/21 22:56:14 Just to make sure, since the callback gets dealloc
Moe 2017/02/21 22:56:14 Done.
lpromero 2017/02/22 13:31:44 Interesting question. If you were using ARC, line
348
349 [_errorCoordinator stop];
350 _errorCoordinator.reset();
351
352 if (callback)
353 callback();
354 }
355
330 #pragma mark - PaymentItemsDisplayCoordinatorDelegate 356 #pragma mark - PaymentItemsDisplayCoordinatorDelegate
331 357
332 - (void)paymentItemsDisplayCoordinatorDidReturn: 358 - (void)paymentItemsDisplayCoordinatorDidReturn:
333 (PaymentItemsDisplayCoordinator*)coordinator { 359 (PaymentItemsDisplayCoordinator*)coordinator {
334 // Clear the 'Updated' label on the payment summary item, if there is one. 360 // Clear the 'Updated' label on the payment summary item, if there is one.
335 [_viewController updatePaymentSummaryWithTotalValueChanged:NO]; 361 [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
336 362
337 [_itemsDisplayCoordinator stop]; 363 [_itemsDisplayCoordinator stop];
338 _itemsDisplayCoordinator.reset(); 364 _itemsDisplayCoordinator.reset();
339 } 365 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 - (void)paymentMethodSelectionCoordinatorDidReturn: 429 - (void)paymentMethodSelectionCoordinatorDidReturn:
404 (PaymentMethodSelectionCoordinator*)coordinator { 430 (PaymentMethodSelectionCoordinator*)coordinator {
405 // Clear the 'Updated' label on the payment summary item, if there is one. 431 // Clear the 'Updated' label on the payment summary item, if there is one.
406 [_viewController updatePaymentSummaryWithTotalValueChanged:NO]; 432 [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
407 433
408 [_methodSelectionCoordinator stop]; 434 [_methodSelectionCoordinator stop];
409 _methodSelectionCoordinator.reset(); 435 _methodSelectionCoordinator.reset();
410 } 436 }
411 437
412 @end 438 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698