[ios] Remove highlight from Infobarbadge when InfoBarModal is dismissed

When a non-coordinator dismissal of the InfoBarModal (i.e. via shortcut)
occurs, this change informs the coordinator of the dismissal so the
proper cleanup can happen and the badge state can be set.

Bug: 911864
Change-Id: Ic1b9b8091e64d2f884963b9bfa656dccccf1c291
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1601565Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658251}

ios/chrome/browser/ui/infobars/coordinators/infobar_coordinator.mm

@@ -213,10 +213,6 @@ const CGFloat kBannerOverlapWithOmnibox = 5.0;
     // Deselect infobar badge in parallel with modal dismissal.
     [self.badgeDelegate infobarModalWillDismiss];
     __weak __typeof(self) weakSelf = self;
-    ProceduralBlock modalCleanUp = ^{
-      weakSelf.modalTransitionDriver = nil;
-      [weakSelf infobarWasDismissed];
-    };
 
     // If the Modal is being presented by the Banner, call dismiss on it.
     // This way the modal dismissal will animate correctly and the completion
@@ -225,7 +221,6 @@ const CGFloat kBannerOverlapWithOmnibox = 5.0;
       [self.bannerViewController
           dismissViewControllerAnimated:animated
                              completion:^{
-                               modalCleanUp();
                                [weakSelf
                                    dismissInfobarBannerAnimated:NO
                                                      completion:completion];
@@ -233,7 +228,6 @@ const CGFloat kBannerOverlapWithOmnibox = 5.0;
     } else {
       [self.baseViewController dismissViewControllerAnimated:animated
                                                   completion:^{
-                                                    modalCleanUp();
                                                     if (completion)
                                                       completion();
                                                   }];
@@ -244,6 +238,15 @@ const CGFloat kBannerOverlapWithOmnibox = 5.0;
   }
 }
 
+- (void)modalInfobarWasDismissed:(id)sender {
+  // infobarModalWillDismiss call is needed, because sometimes the
+  // baseViewController will dismiss the modal without going through the
+  // coordinator.
+  [self.badgeDelegate infobarModalWillDismiss];
+  self.modalTransitionDriver = nil;
+  [self infobarWasDismissed];
+}
+
 #pragma mark InfobarModalPositioner
 
 - (CGFloat)modalHeight {

ios/chrome/browser/ui/infobars/modals/infobar_modal_delegate.h

@@ -21,6 +21,9 @@
 // action.
 - (void)modalInfobarButtonWasAccepted:(id)sender;
 
+// Called when the InfobarModal was dismissed.
+- (void)modalInfobarWasDismissed:(id)sender;
+
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_INFOBARS_MODALS_INFOBAR_MODAL_DELEGATE_H_

ios/chrome/browser/ui/infobars/modals/infobar_modal_view_controller.mm

@@ -52,6 +52,11 @@
   self.navigationItem.rightBarButtonItem = settingsButton;
 }
 
+- (void)viewDidDisappear:(BOOL)animated {
+  [self.infobarModalDelegate modalInfobarWasDismissed:self];
+  [super viewDidDisappear:animated];
+}
+
 #pragma mark - Private Methods
 
 - (void)dismissInfobarModal:(UIButton*)sender {

ios/chrome/browser/ui/infobars/modals/infobar_password_table_view_controller.mm

@@ -89,6 +89,11 @@ typedef NS_ENUM(NSInteger, ItemType) {
       self.tableView.contentSize.height > self.view.frame.size.height;
 }
 
+- (void)viewDidDisappear:(BOOL)animated {
+  [self.infobarModalDelegate modalInfobarWasDismissed:self];
+  [super viewDidDisappear:animated];
+}
+
 #pragma mark - TableViewModel
 
 - (void)loadModel {

ios/chrome/test/app/chrome_test_util.h

+
 // Copyright 2016 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.

ios/showcase/infobars/sc_infobar_banner_coordinator.mm

@@ -147,4 +147,7 @@ NSString* const kInfobarBannerPresentedModalLabel = @"Modal Infobar";
                                               completion:nil];
 }
 
+- (void)modalInfobarWasDismissed:(id)sender {
+}
+
 @end