[ios] Remove -rootViewController from /passwords

The infobar controller needs a base view controller, from which to
present the accounts selector.

Bug: 785319
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: If1e4b70f58d0cb47b83524f064039cc1e2c2d607
Reviewed-on: https://chromium-review.googlesource.com/802457Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Vaclav Brozek <vabr@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521002}

ios/chrome/browser/passwords/ios_chrome_update_password_infobar_delegate.h

@@ -11,6 +11,7 @@
 #include "ios/chrome/browser/passwords/ios_chrome_password_manager_infobar_delegate.h"
 
 @protocol ApplicationCommands;
+@class UIViewController;
 
 namespace password_manager {
 class PasswordFormManager;
@@ -25,12 +26,14 @@ class IOSChromeUpdatePasswordInfoBarDelegate
     : public IOSChromePasswordManagerInfoBarDelegate {
  public:
   // Creates the infobar for |form_to_save| and adds it to |infobar_manager|.
-  // |is_smart_lock_enabled| controls the branding string. |dispatcher| is not
-  // retained.
+  // |is_smart_lock_enabled| controls the branding string. |baseViewController|
+  // is the base view controller from which to present UI, and is not retained.
+  // |dispatcher| is not retained.
   static void Create(
       bool is_smart_lock_branding_enabled,
       infobars::InfoBarManager* infobar_manager,
       std::unique_ptr<password_manager::PasswordFormManager> form_to_save,
+      UIViewController* baseViewController,
       id<ApplicationCommands> dispatcher);
 
   ~IOSChromeUpdatePasswordInfoBarDelegate() override;

ios/chrome/browser/passwords/ios_chrome_update_password_infobar_delegate.mm

@@ -31,6 +31,7 @@ void IOSChromeUpdatePasswordInfoBarDelegate::Create(
     bool is_smart_lock_branding_enabled,
     infobars::InfoBarManager* infobar_manager,
     std::unique_ptr<PasswordFormManager> form_manager,
+    UIViewController* baseViewController,
     id<ApplicationCommands> dispatcher) {
   DCHECK(infobar_manager);
   auto delegate = base::WrapUnique(new IOSChromeUpdatePasswordInfoBarDelegate(
@@ -39,6 +40,7 @@ void IOSChromeUpdatePasswordInfoBarDelegate::Create(
   std::unique_ptr<InfoBarIOS> infobar(new InfoBarIOS(std::move(delegate)));
   UpdatePasswordInfoBarController* controller =
       [[UpdatePasswordInfoBarController alloc] initWithDelegate:infobar.get()];
+  [controller setBaseViewController:baseViewController];
   infobar->SetController(controller);
   infobar_manager->AddInfoBar(std::move(infobar));
 }

ios/chrome/browser/passwords/password_controller.h

@@ -54,6 +54,9 @@ class PasswordManagerDriver;
 // The PasswordFormFiller owned by this PasswordController.
 @property(nonatomic, readonly) id<PasswordFormFiller> passwordFormFiller;
 
+// The base view controller from which to present UI.
+@property(nonatomic, readwrite, weak) UIViewController* baseViewController;
+
 // The dispatcher used for the PasswordController. This property can return nil
 // even after being set to a non-nil object.
 @property(nonatomic, weak) id<ApplicationCommands> dispatcher;

ios/chrome/browser/passwords/password_controller.mm

@@ -296,6 +296,8 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
 
 @synthesize isWebStateDestroyed = _isWebStateDestroyed;
 
+@synthesize baseViewController = _baseViewController;
+
 @synthesize dispatcher = _dispatcher;
 
 @synthesize delegate = _delegate;
@@ -1011,7 +1013,7 @@ bool GetPageURLAndCheckTrustLevel(web::WebState* web_state, GURL* page_url) {
     case PasswordInfoBarType::UPDATE:
       IOSChromeUpdatePasswordInfoBarDelegate::Create(
           isSmartLockBrandingEnabled, infoBarManager, std::move(form),
-          self.dispatcher);
+          self.baseViewController, self.dispatcher);
       break;
   }
 }

ios/chrome/browser/passwords/password_tab_helper.h

@@ -15,6 +15,7 @@
 @protocol PasswordControllerDelegate;
 @protocol PasswordFormFiller;
 @protocol PasswordsUiDelegate;
+@class UIViewController;
 
 // Class binding a PasswordController to a WebState.
 class PasswordTabHelper : public web::WebStateObserver,
@@ -25,6 +26,9 @@ class PasswordTabHelper : public web::WebStateObserver,
   // Creates a PasswordTabHelper and attaches it to the given |web_state|.
   static void CreateForWebState(web::WebState* web_state);
 
+  // Sets the BaseViewController from which to present UI.
+  void SetBaseViewController(UIViewController* baseViewController);
+
   // Sets the PasswordController dispatcher.
   void SetDispatcher(id<ApplicationCommands> dispatcher);
 

ios/chrome/browser/passwords/password_tab_helper.mm

@@ -25,6 +25,11 @@ void PasswordTabHelper::CreateForWebState(web::WebState* web_state) {
   }
 }
 
+void PasswordTabHelper::SetBaseViewController(
+    UIViewController* baseViewController) {
+  controller_.baseViewController = baseViewController;
+}
+
 void PasswordTabHelper::SetDispatcher(id<ApplicationCommands> dispatcher) {
   controller_.dispatcher = dispatcher;
 }

ios/chrome/browser/passwords/update_password_infobar_controller.h

@@ -13,6 +13,9 @@ class IOSChromeUpdatePasswordInfoBarDelegate;
 // the user whether they want to update their password.
 @interface UpdatePasswordInfoBarController : ConfirmInfoBarController
 
+// The base view controller from which to present UI.
+@property(nonatomic, readwrite, weak) UIViewController* baseViewController;
+
 - (InfoBarView*)viewForDelegate:
                     (IOSChromeUpdatePasswordInfoBarDelegate*)delegate
                           frame:(CGRect)frame;

ios/chrome/browser/passwords/update_password_infobar_controller.mm

@@ -28,7 +28,7 @@ NSUInteger kAccountTag = 10;
 @end
 
 @implementation UpdatePasswordInfoBarController
-
+@synthesize baseViewController = _baseViewController;
 @synthesize selectorCoordinator = _selectorCoordinator;
 
 - (InfoBarView*)viewForDelegate:
@@ -65,10 +65,9 @@ NSUInteger kAccountTag = 10;
   if (tag != kAccountTag)
     return;
 
-  UIViewController* baseViewController =
-      [[UIApplication sharedApplication] keyWindow].rootViewController;
+  DCHECK(self.baseViewController);
   self.selectorCoordinator = [[SelectorCoordinator alloc]
-      initWithBaseViewController:baseViewController];
+      initWithBaseViewController:self.baseViewController];
   self.selectorCoordinator.delegate = self;
   self.selectorCoordinator.options =
       [NSOrderedSet orderedSetWithArray:_delegate->GetAccounts()];

ios/chrome/browser/ui/browser_view_controller.mm

@@ -2449,6 +2449,7 @@ bubblePresenterForFeature:(const base::Feature&)feature
   // TODO(crbug.com/777557): do not pass the dispatcher to PasswordTabHelper.
   if (PasswordTabHelper* passwordTabHelper =
           PasswordTabHelper::FromWebState(tab.webState)) {
+    passwordTabHelper->SetBaseViewController(self);
     passwordTabHelper->SetDispatcher(self.dispatcher);
     passwordTabHelper->SetPasswordControllerDelegate(self);
   }