[iOS] Rename navigationController to baseNavigationController

This is done to make clear what is the purpose of the navigation
controller.

Bug: None
Change-Id: I8207f16e4b8551b7d568bf017880bb9814c70bbb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2091529
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748509}

ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/advanced_settings_signin_coordinator.mm

@@ -67,7 +67,7 @@ using l10n_util::GetNSString;
       initWithBaseViewController:self.advancedSettingsSigninNavigationController
                          browser:self.browser
                             mode:mode];
-  self.googleServicesSettingsCoordinator.navigationController =
+  self.googleServicesSettingsCoordinator.baseNavigationController =
       self.advancedSettingsSigninNavigationController;
   [self.googleServicesSettingsCoordinator start];
 

ios/chrome/browser/ui/coordinators/chrome_coordinator.h

@@ -44,8 +44,10 @@ typedef NSMutableArray<ChromeCoordinator*> MutableCoordinatorArray;
 // The view controller this coordinator was initialized with.
 @property(weak, nonatomic, readonly) UIViewController* baseViewController;
 
-// The navigation controller this coordinator was initialized with.
-@property(weak, nonatomic) UINavigationController* navigationController;
+// Parent coordinator can set this to allow the child coordinator to push their
+// view controller to the navigationController instead of presenting it if
+// needed. This is usually the same object as |baseViewController|.
+@property(weak, nonatomic) UINavigationController* baseNavigationController;
 
 // The coordinator's BrowserState.
 @property(assign, nonatomic, readonly) ChromeBrowserState* browserState;

ios/chrome/browser/ui/overlays/infobar_modal/infobar_modal_overlay_coordinator.mm

@@ -70,7 +70,7 @@
 // Called when the dismissal of the modal UI is finished.
 - (void)finishDismissal {
   [self resetModal];
-  self.navigationController = nil;
+  self.modalNavController = nil;
   // Notify the presentation context that the dismissal has finished.  This
   // is necessary to synchronize OverlayPresenter scheduling logic with the UI
   // layer.

ios/chrome/browser/ui/settings/google_services/google_services_settings_coordinator.mm

@@ -103,9 +103,9 @@
       ProfileSyncServiceFactory::GetForBrowserState(self.browserState);
   viewController.modelDelegate = self.mediator;
   viewController.serviceDelegate = self.mediator;
-  DCHECK(self.navigationController);
-  [self.navigationController pushViewController:self.viewController
-                                       animated:YES];
+  DCHECK(self.baseNavigationController);
+  [self.baseNavigationController pushViewController:self.viewController
+                                           animated:YES];
 }
 
 - (void)stop {
@@ -208,7 +208,7 @@
   controller.dispatcher = static_cast<
       id<ApplicationCommands, BrowserCommands, BrowsingDataCommands>>(
       self.browser->GetCommandDispatcher());
-  [self.navigationController pushViewController:controller animated:YES];
+  [self.baseNavigationController pushViewController:controller animated:YES];
 }
 
 - (void)showSignIn {
@@ -225,7 +225,7 @@
                                    ACCESS_POINT_GOOGLE_SERVICES_SETTINGS
                    promoAction:signin_metrics::PromoAction::
                                    PROMO_ACTION_NO_SIGNIN_PROMO
-      presentingViewController:self.navigationController
+      presentingViewController:self.baseNavigationController
                     completion:^(BOOL success) {
                       [weakSelf signInInteractionCoordinatorDidComplete];
                     }];
@@ -235,7 +235,7 @@
   AccountsTableViewController* controller =
       [[AccountsTableViewController alloc] initWithBrowser:self.browser
                                  closeSettingsOnAddAccount:NO];
-  [self.navigationController pushViewController:controller animated:YES];
+  [self.baseNavigationController pushViewController:controller animated:YES];
 }
 
 - (void)openManageSyncSettings {
@@ -243,8 +243,8 @@
   self.manageSyncSettingsCoordinator = [[ManageSyncSettingsCoordinator alloc]
       initWithBaseViewController:self.viewController
                          browser:self.browser];
-  self.manageSyncSettingsCoordinator.navigationController =
-      self.navigationController;
+  self.manageSyncSettingsCoordinator.baseNavigationController =
+      self.baseNavigationController;
   self.manageSyncSettingsCoordinator.delegate = self;
   [self.manageSyncSettingsCoordinator start];
 }

ios/chrome/browser/ui/settings/google_services/manage_sync_settings_coordinator.mm

@@ -62,7 +62,7 @@
 @implementation ManageSyncSettingsCoordinator
 
 - (void)start {
-  DCHECK(self.navigationController);
+  DCHECK(self.baseNavigationController);
   self.mediator = [[ManageSyncSettingsMediator alloc]
       initWithSyncService:self.syncService
           userPrefService:self.browserState->GetPrefs()];
@@ -75,8 +75,8 @@
   self.viewController.presentationDelegate = self;
   self.viewController.modelDelegate = self.mediator;
   self.mediator.consumer = self.viewController;
-  [self.navigationController pushViewController:self.viewController
-                                       animated:YES];
+  [self.baseNavigationController pushViewController:self.viewController
+                                           animated:YES];
   _syncObserver.reset(new SyncObserverBridge(self, self.syncService));
 }
 
@@ -95,9 +95,9 @@
       self.dismissWebAndAppSettingDetailsControllerBlock(NO);
       self.dismissWebAndAppSettingDetailsControllerBlock = nil;
     }
-    [self.navigationController popToViewController:self.viewController
-                                          animated:NO];
-    [self.navigationController popViewControllerAnimated:YES];
+    [self.baseNavigationController popToViewController:self.viewController
+                                              animated:NO];
+    [self.baseNavigationController popViewControllerAnimated:YES];
   }
 }
 
@@ -140,7 +140,8 @@
   controllerToPush.dispatcher = static_cast<
       id<ApplicationCommands, BrowserCommands, BrowsingDataCommands>>(
       self.browser->GetCommandDispatcher());
-  [self.navigationController pushViewController:controllerToPush animated:YES];
+  [self.baseNavigationController pushViewController:controllerToPush
+                                           animated:YES];
 }
 
 - (void)openWebAppActivityDialog {

ios/chrome/browser/ui/settings/settings_navigation_controller.mm

@@ -369,7 +369,7 @@ NSString* const kSettingsDoneButtonId = @"kSettingsDoneButtonId";
           initWithBaseViewController:self
                              browser:self.browser
                                 mode:GoogleServicesSettingsModeSettings];
-  self.googleServicesSettingsCoordinator.navigationController = self;
+  self.googleServicesSettingsCoordinator.baseNavigationController = self;
   self.googleServicesSettingsCoordinator.delegate = self;
   [self.googleServicesSettingsCoordinator start];
 }

ios/chrome/browser/ui/settings/settings_table_view_controller.mm

@@ -925,7 +925,7 @@ NSString* kDevViewSourceKey = @"DevViewSource";
           initWithBaseViewController:self.navigationController
                              browser:_browser
                                 mode:GoogleServicesSettingsModeSettings];
-  _googleServicesSettingsCoordinator.navigationController =
+  _googleServicesSettingsCoordinator.baseNavigationController =
       self.navigationController;
   _googleServicesSettingsCoordinator.delegate = self;
   [_googleServicesSettingsCoordinator start];