[Payment Request] Fixes modally presented editors

ios/chrome/browser/ui/payments/credit_card_edit_coordinator.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/payments/credit_card_edit_coordinator.h"
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
   return false;
 }
 
 }  // namespace
 
 @interface CreditCardEditCoordinator ()
 
 @property(nonatomic, strong)
     BillingAddressSelectionCoordinator* billingAddressSelectionCoordinator;
 
-@property(nonatomic, strong) PaymentRequestEditViewController* viewController;
+@property(nonatomic, strong) UINavigationController* viewController;
+
+@property(nonatomic, strong)
+    PaymentRequestEditViewController* editViewController;
 
 @property(nonatomic, strong) CreditCardEditViewControllerMediator* mediator;
 
 @end
 
 @implementation CreditCardEditCoordinator
 
 @synthesize creditCard = _creditCard;
 @synthesize paymentRequest = _paymentRequest;
 @synthesize delegate = _delegate;
 @synthesize billingAddressSelectionCoordinator =
     _billingAddressSelectionCoordinator;
 @synthesize viewController = _viewController;
+@synthesize editViewController = _editViewController;
 @synthesize mediator = _mediator;
 
 - (void)start {
-  _viewController = [[PaymentRequestEditViewController alloc] init];
+  _editViewController = [[PaymentRequestEditViewController alloc] init];
   // TODO(crbug.com/602666): Title varies depending on the missing fields.
   NSString* title = _creditCard
                         ? l10n_util::GetNSString(IDS_PAYMENTS_EDIT_CARD)
                         : l10n_util::GetNSString(IDS_PAYMENTS_ADD_CARD_LABEL);
-  [_viewController setTitle:title];
-  [_viewController setDelegate:self];
-  [_viewController setValidatorDelegate:self];
+  [_editViewController setTitle:title];
+  [_editViewController setDelegate:self];
+  [_editViewController setValidatorDelegate:self];
   _mediator = [[CreditCardEditViewControllerMediator alloc]
       initWithPaymentRequest:_paymentRequest
                   creditCard:_creditCard];
-  [_mediator setConsumer:_viewController];
-  [_viewController setDataSource:_mediator];
-  [_viewController loadModel];
+  [_mediator setConsumer:_editViewController];
+  [_editViewController setDataSource:_mediator];
+  [_editViewController loadModel];
 
-  [[self baseViewController] presentViewController:_viewController
+  self.viewController = [[UINavigationController alloc]
+      initWithRootViewController:self.editViewController];
+  [self.viewController setModalPresentationStyle:UIModalPresentationFormSheet];
+  [self.viewController
+      setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
+  [self.viewController setNavigationBarHidden:YES];
+
+  [[self baseViewController] presentViewController:self.viewController
                                           animated:YES
                                         completion:nil];
 }
 
 - (void)stop {
   [[self.viewController presentingViewController]
       dismissViewControllerAnimated:YES
                          completion:nil];
   [self.billingAddressSelectionCoordinator stop];
   self.billingAddressSelectionCoordinator = nil;
-  _viewController = nil;
+  self.editViewController = nil;
+  self.viewController = nil;
 }
 
 #pragma mark - PaymentRequestEditViewControllerValidator
 
 - (NSString*)paymentRequestEditViewController:
                  (PaymentRequestEditViewController*)controller
                                 validateField:(EditorField*)field {
   if (field.value.length) {
     base::string16 errorMessage;
     base::string16 valueString = base::SysNSStringToUTF16(field.value);
@@ skipping 15 matching lines @@
 }
 
 #pragma mark - PaymentRequestEditViewControllerDelegate
 
 - (void)paymentRequestEditViewController:
             (PaymentRequestEditViewController*)controller
                           didSelectField:(EditorField*)field {
   if (field.autofillUIType == AutofillUITypeCreditCardBillingAddress) {
     self.billingAddressSelectionCoordinator =
         [[BillingAddressSelectionCoordinator alloc]
-            initWithBaseViewController:self.viewController];
+            initWithBaseViewController:self.editViewController];
     [self.billingAddressSelectionCoordinator
         setPaymentRequest:self.paymentRequest];
     [self.billingAddressSelectionCoordinator
         setSelectedBillingProfile:self.mediator.billingProfile];
     [self.billingAddressSelectionCoordinator setDelegate:self];
     [self.billingAddressSelectionCoordinator start];
   }
 }
 
 - (void)paymentRequestEditViewController:
@@ skipping 53 matching lines @@
 #pragma mark - BillingAddressSelectionCoordinatorDelegate
 
 - (void)billingAddressSelectionCoordinator:
             (BillingAddressSelectionCoordinator*)coordinator
                    didSelectBillingAddress:
                        (autofill::AutofillProfile*)billingAddress {
   // Update view controller's data source with the selection and reload the view
   // controller.
   DCHECK(billingAddress);
   [self.mediator setBillingProfile:billingAddress];
-  [self.viewController loadModel];
-  [self.viewController.collectionView reloadData];
+  [self.editViewController loadModel];
+  [self.editViewController.collectionView reloadData];
 
   [self.billingAddressSelectionCoordinator stop];
   self.billingAddressSelectionCoordinator = nil;
 }
 
 - (void)billingAddressSelectionCoordinatorDidReturn:
     (BillingAddressSelectionCoordinator*)coordinator {
   [self.billingAddressSelectionCoordinator stop];
   self.billingAddressSelectionCoordinator = nil;
 }
 
 @end