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

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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 _navigationController.reset([[UINavigationController alloc] 181 _navigationController.reset([[UINavigationController alloc]
179 initWithRootViewController:_viewController]); 182 initWithRootViewController:_viewController]);
180 [_navigationController setNavigationBarHidden:YES]; 183 [_navigationController setNavigationBarHidden:YES];
181 184
182 [[self baseViewController] presentViewController:_navigationController 185 [[self baseViewController] presentViewController:_navigationController
183 animated:YES 186 animated:YES
184 completion:nil]; 187 completion:nil];
185 } 188 }
186 189
187 - (void)stop { 190 - (void)stop {
188 [[_navigationController presentingViewController] 191 [_navigationController dismissViewControllerAnimated:YES completion:nil];
189 dismissViewControllerAnimated:YES
190 completion:nil];
191 _itemsDisplayCoordinator.reset(); 192 _itemsDisplayCoordinator.reset();
192 _shippingAddressSelectionCoordinator.reset(); 193 _shippingAddressSelectionCoordinator.reset();
193 _shippingOptionSelectionCoordinator.reset(); 194 _shippingOptionSelectionCoordinator.reset();
194 _methodSelectionCoordinator.reset(); 195 _methodSelectionCoordinator.reset();
196 _errorCoordinator.reset();
197 _viewController.reset();
195 _navigationController.reset(); 198 _navigationController.reset();
196 _viewController.reset();
197 } 199 }
198 200
199 - (void)sendPaymentResponse { 201 - (void)sendPaymentResponse {
200 DCHECK(_paymentRequest->selected_credit_card()); 202 DCHECK(_paymentRequest->selected_credit_card());
201 autofill::CreditCard* card = _paymentRequest->selected_credit_card(); 203 autofill::CreditCard* card = _paymentRequest->selected_credit_card();
202 _fullCardRequester = base::MakeUnique<FullCardRequester>( 204 _fullCardRequester = base::MakeUnique<FullCardRequester>(
203 self, _navigationController, _browserState); 205 self, _navigationController, _browserState);
204 _fullCardRequester->GetFullCard(card, _autofillManager); 206 _fullCardRequester->GetFullCard(card, _autofillManager);
205 } 207 }
206 208
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 // view. The updated selection is already reflected in |_paymentRequest|. 268 // view. The updated selection is already reflected in |_paymentRequest|.
267 [_viewController updateSelectedShippingOptionUI]; 269 [_viewController updateSelectedShippingOptionUI];
268 270
269 // Dismiss the shipping option selection view. 271 // Dismiss the shipping option selection view.
270 [_shippingOptionSelectionCoordinator stop]; 272 [_shippingOptionSelectionCoordinator stop];
271 _shippingOptionSelectionCoordinator.reset(); 273 _shippingOptionSelectionCoordinator.reset();
272 } 274 }
273 } 275 }
274 } 276 }
275 277
278 - (void)displayErrorWithCallback:(void (^)())callback {
279 _errorCoordinator.reset([[PaymentRequestErrorCoordinator alloc]
280 initWithBaseViewController:_navigationController]);
281 [_errorCoordinator setCallback:callback];
282 [_errorCoordinator setDelegate:self];
283
284 [_errorCoordinator start];
285 }
286
276 #pragma mark - PaymentRequestViewControllerDelegate 287 #pragma mark - PaymentRequestViewControllerDelegate
277 288
278 - (void)paymentRequestViewControllerDidCancel: 289 - (void)paymentRequestViewControllerDidCancel:
279 (PaymentRequestViewController*)controller { 290 (PaymentRequestViewController*)controller {
280 [_delegate paymentRequestCoordinatorDidCancel:self]; 291 [_delegate paymentRequestCoordinatorDidCancel:self];
281 } 292 }
282 293
283 - (void)paymentRequestViewControllerDidConfirm: 294 - (void)paymentRequestViewControllerDidConfirm:
284 (PaymentRequestViewController*)controller { 295 (PaymentRequestViewController*)controller {
285 [self sendPaymentResponse]; 296 [self sendPaymentResponse];
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 - (void)paymentRequestViewControllerDidSelectPaymentMethodItem: 331 - (void)paymentRequestViewControllerDidSelectPaymentMethodItem:
321 (PaymentRequestViewController*)controller { 332 (PaymentRequestViewController*)controller {
322 _methodSelectionCoordinator.reset([[PaymentMethodSelectionCoordinator alloc] 333 _methodSelectionCoordinator.reset([[PaymentMethodSelectionCoordinator alloc]
323 initWithBaseViewController:_viewController]); 334 initWithBaseViewController:_viewController]);
324 [_methodSelectionCoordinator setPaymentRequest:_paymentRequest]; 335 [_methodSelectionCoordinator setPaymentRequest:_paymentRequest];
325 [_methodSelectionCoordinator setDelegate:self]; 336 [_methodSelectionCoordinator setDelegate:self];
326 337
327 [_methodSelectionCoordinator start]; 338 [_methodSelectionCoordinator start];
328 } 339 }
329 340
341 #pragma mark - PaymentRequestErrorCoordinatorDelegate
342
343 - (void)paymentRequestErrorCoordinatorDidDismiss:
344 (PaymentRequestErrorCoordinator*)coordinator {
345 void (^callback)() = coordinator.callback;
346
347 [_errorCoordinator stop];
348 _errorCoordinator.reset();
349
350 if (callback)
351 callback();
352 }
353
330 #pragma mark - PaymentItemsDisplayCoordinatorDelegate 354 #pragma mark - PaymentItemsDisplayCoordinatorDelegate
331 355
332 - (void)paymentItemsDisplayCoordinatorDidReturn: 356 - (void)paymentItemsDisplayCoordinatorDidReturn:
333 (PaymentItemsDisplayCoordinator*)coordinator { 357 (PaymentItemsDisplayCoordinator*)coordinator {
334 // Clear the 'Updated' label on the payment summary item, if there is one. 358 // Clear the 'Updated' label on the payment summary item, if there is one.
335 [_viewController updatePaymentSummaryWithTotalValueChanged:NO]; 359 [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
336 360
337 [_itemsDisplayCoordinator stop]; 361 [_itemsDisplayCoordinator stop];
338 _itemsDisplayCoordinator.reset(); 362 _itemsDisplayCoordinator.reset();
339 } 363 }
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 - (void)paymentMethodSelectionCoordinatorDidReturn: 427 - (void)paymentMethodSelectionCoordinatorDidReturn:
404 (PaymentMethodSelectionCoordinator*)coordinator { 428 (PaymentMethodSelectionCoordinator*)coordinator {
405 // Clear the 'Updated' label on the payment summary item, if there is one. 429 // Clear the 'Updated' label on the payment summary item, if there is one.
406 [_viewController updatePaymentSummaryWithTotalValueChanged:NO]; 430 [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
407 431
408 [_methodSelectionCoordinator stop]; 432 [_methodSelectionCoordinator stop];
409 _methodSelectionCoordinator.reset(); 433 _methodSelectionCoordinator.reset();
410 } 434 }
411 435
412 @end 436 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698