[Payment Request] Fixes modally presented editors

ios/chrome/browser/ui/payments/address_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/address_edit_coordinator.h"
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
@@ skipping 17 matching lines @@
 namespace {
 using ::AutofillUITypeFromAutofillType;
 using ::AutofillTypeFromAutofillUIType;
 }  // namespace
 
 @interface AddressEditCoordinator ()
 
 @property(nonatomic, strong)
     CountrySelectionCoordinator* countrySelectionCoordinator;
 
+@property(nonatomic, strong) UINavigationController* navigationController;

[lpromero, 2017/06/20 08:46:05]

I think I'd go the other way. The nav controller is self.viewController and you
keep a new variable for the edit view controller if needed. That way the
coordinator's viewController property is really the one being presented.

[Moe, 2017/06/20 13:33:00]

Done.

+
 @property(nonatomic, strong) PaymentRequestEditViewController* viewController;
 
 @property(nonatomic, strong) AddressEditMediator* mediator;
 
 @end
 
 @implementation AddressEditCoordinator
 
 @synthesize address = _address;
 @synthesize paymentRequest = _paymentRequest;
 @synthesize delegate = _delegate;
 @synthesize countrySelectionCoordinator = _countrySelectionCoordinator;
+@synthesize navigationController = _navigationController;
 @synthesize viewController = _viewController;
 @synthesize mediator = _mediator;
 
 - (void)start {
   self.viewController = [[PaymentRequestEditViewController alloc] init];
   // TODO(crbug.com/602666): Title varies depending on what field is missing.
   // e.g., Add Email vs. Add Phone Number.
   NSString* title = self.address
                         ? l10n_util::GetNSString(IDS_PAYMENTS_EDIT_ADDRESS)
                         : l10n_util::GetNSString(IDS_PAYMENTS_ADD_ADDRESS);
   [self.viewController setTitle:title];
   [self.viewController setDelegate:self];
   [self.viewController setValidatorDelegate:self];
   self.mediator =
       [[AddressEditMediator alloc] initWithPaymentRequest:self.paymentRequest
                                                   address:self.address];
   [self.mediator setConsumer:self.viewController];
   [self.viewController setDataSource:self.mediator];
   [self.viewController loadModel];
 
-  [[self baseViewController] presentViewController:self.viewController
+  self.navigationController = [[UINavigationController alloc]
+      initWithRootViewController:_viewController];
+  [self.navigationController
+      setModalPresentationStyle:UIModalPresentationFormSheet];
+  [self.navigationController
+      setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
+  [self.navigationController setNavigationBarHidden:YES];
+
+  [[self baseViewController] presentViewController:self.navigationController
                                           animated:YES
                                         completion:nil];
 }
 
 - (void)stop {
-  [[self.viewController presentingViewController]
+  [[self.navigationController presentingViewController]
       dismissViewControllerAnimated:YES
                          completion:nil];
   [self.countrySelectionCoordinator stop];
   self.countrySelectionCoordinator = nil;
   self.viewController = nil;
+  self.navigationController = nil;
 }
 
 #pragma mark - PaymentRequestEditViewControllerValidator
 
 - (NSString*)paymentRequestEditViewController:
                  (PaymentRequestEditViewController*)controller
                                 validateField:(EditorField*)field {
   if (field.value.length) {
     switch (field.autofillUIType) {
       case AutofillUITypeProfileHomePhoneWholeNumber: {
@@ skipping 80 matching lines @@
   if (self.mediator.selectedCountryCode != countryCode) {
     [self.mediator setSelectedCountryCode:countryCode];
     [self.viewController loadModel];
     [self.viewController.collectionView reloadData];
   }
   [self.countrySelectionCoordinator stop];
   self.countrySelectionCoordinator = nil;
 }
 
 @end