[iOS] Clean up ToolbarAccessoryPresenter to use ContainedPresenter

This makes things much cleaner because ContainedPresenter automatically
comes with ContainedPresenterDelegate.

This does require the addition of FindBarViewController to wrap
FindBarView as ContainedPresenter only works with view controllers.

This can also remove the |selectText| parameter from
|-showFindBarWithAnimation| because it is only called with |selectText|
as YES.


Bug: 1028938
Change-Id: Ieadd8c24d8d55455a3d07aa91c4ab1f3d8742718
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960275Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Commit-Queue: Robbie Gibson <rkgibson@google.com>
Cr-Commit-Position: refs/heads/master@{#727973}

ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@@ -91,6 +91,7 @@
 #import "ios/chrome/browser/ui/download/download_manager_coordinator.h"
 #import "ios/chrome/browser/ui/elements/activity_overlay_coordinator.h"
 #import "ios/chrome/browser/ui/find_bar/find_bar_controller_ios.h"
+#import "ios/chrome/browser/ui/find_bar/find_bar_view_controller.h"
 #import "ios/chrome/browser/ui/first_run/welcome_to_chrome_view_controller.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_animator.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller.h"
@@ -115,6 +116,7 @@
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
 #import "ios/chrome/browser/ui/payments/payment_request_manager.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_coordinator.h"
+#include "ios/chrome/browser/ui/presenters/contained_presenter_delegate.h"
 #import "ios/chrome/browser/ui/presenters/vertical_animation_container.h"
 #import "ios/chrome/browser/ui/sad_tab/sad_tab_coordinator.h"
 #import "ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_coordinator.h"
@@ -341,6 +343,7 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 @interface BrowserViewController () <ActivityServicePresentation,
                                      BubblePresenterDelegate,
                                      CaptivePortalDetectorTabHelperDelegate,
+                                     ContainedPresenterDelegate,
                                      CRWWebStateDelegate,
                                      CRWWebStateObserver,
                                      DialogPresenterDelegate,
@@ -671,11 +674,9 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 - (void)updateFindBar:(BOOL)initialUpdate shouldFocus:(BOOL)shouldFocus;
 // Hide find bar.
 - (void)hideFindBarWithAnimation:(BOOL)animate;
-// Shows find bar. If |selectText| is YES, all text inside the Find Bar
-// textfield will be selected. If |shouldFocus| is set to YES, the textfield is
-// set to be first responder.
+// Shows find bar. All text inside the Find Bar textfield will be selected. If
+// |shouldFocus| is set to YES, the textfield is set to be first responder.
 - (void)showFindBarWithAnimation:(BOOL)animate
-                      selectText:(BOOL)selectText
                      shouldFocus:(BOOL)shouldFocus;
 
 // Alerts
@@ -2464,7 +2465,6 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   auto* findHelper = FindTabHelper::FromWebState(webState);
   if (findHelper && findHelper->IsFindUIActive()) {
     [self showFindBarWithAnimation:NO
-                        selectText:YES
                        shouldFocus:[self.findBarController isFocused]];
   }
 
@@ -2573,36 +2573,23 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 
 - (void)hideFindBarWithAnimation:(BOOL)animate {
   [self.findBarController findBarViewWillHide];
-  [self.toolbarAccessoryPresenter
-      hideToolbarAccessoryViewAnimated:animate
-                            completion:^() {
-                              [self.findBarController findBarViewDidHide];
-                            }];
+  [self.toolbarAccessoryPresenter dismissAnimated:animate];
 }
 
 - (void)showFindBarWithAnimation:(BOOL)animate
-                      selectText:(BOOL)selectText
                      shouldFocus:(BOOL)shouldFocus {
   DCHECK(self.findBarController);
   if (!self.toolbarAccessoryPresenter) {
-    self.toolbarAccessoryPresenter = [[ToolbarAccessoryPresenter alloc]
-        initWithBaseViewController:self
-                       isIncognito:_isOffTheRecord];
-  }
-
-  UIView* findBarView = [self.findBarController
-      createFindBarViewWithDarkAppearance:_isOffTheRecord];
-  __weak __typeof(self) weakSelf = self;
-  [self.toolbarAccessoryPresenter
-      addToolbarAccessoryView:findBarView
-                     animated:animate
-                   completion:^() {
-                     __strong __typeof(self) strongSelf = weakSelf;
-                     if (selectText) {
-                       [strongSelf.findBarController selectAllText];
-                     }
-                   }];
+    self.toolbarAccessoryPresenter =
+        [[ToolbarAccessoryPresenter alloc] initWithIsIncognito:_isOffTheRecord];
+    self.toolbarAccessoryPresenter.delegate = self;
+    self.toolbarAccessoryPresenter.baseViewController = self;
+  }
 
+  self.toolbarAccessoryPresenter.presentedViewController =
+      self.findBarController.findBarViewController;
+  [self.toolbarAccessoryPresenter prepareForPresentation];
+  [self.toolbarAccessoryPresenter presentAnimated:animate];
   [self updateFindBar:YES shouldFocus:shouldFocus];
 }
 
@@ -3017,6 +3004,16 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   [self.dispatcher showSavedPasswordsSettingsFromViewController:self];
 }
 
+#pragma mark - ContainedPresenterDelegate methods.
+
+- (void)containedPresenterDidPresent:(id<ContainedPresenter>)presenter {
+  [self.findBarController selectAllText];
+}
+
+- (void)containedPresenterDidDismiss:(id<ContainedPresenter>)presenter {
+  [self.findBarController findBarViewDidHide];
+}
+
 #pragma mark - CRWWebStateDelegate methods.
 
 - (web::WebState*)webState:(web::WebState*)webState
@@ -4137,7 +4134,7 @@ NSString* const kBrowserViewControllerSnackbarCategory =
   DCHECK(!helper->IsFindUIActive());
   helper->SetResponseDelegate(self);
   helper->SetFindUIActive(true);
-  [self showFindBarWithAnimation:YES selectText:YES shouldFocus:YES];
+  [self showFindBarWithAnimation:YES shouldFocus:YES];
 }
 
 - (void)closeFindInPage {

ios/chrome/browser/ui/find_bar/BUILD.gn

@@ -9,6 +9,8 @@ source_set("find_bar") {
     "find_bar_controller_ios.mm",
     "find_bar_view.h",
     "find_bar_view.mm",
+    "find_bar_view_controller.h",
+    "find_bar_view_controller.mm",
   ]
   deps = [
     ":constants",

ios/chrome/browser/ui/find_bar/find_bar_controller_ios.h

@@ -8,12 +8,17 @@
 #import <UIKit/UIKit.h>
 
 @protocol BrowserCommands;
+@class FindBarViewController;
 @class FindInPageModel;
 
 @interface FindBarControllerIOS : NSObject
 
 // The dispatcher for sending browser commands.
 @property(nonatomic, weak) id<BrowserCommands> dispatcher;
+// The view controller containing all the buttons and textfields that is common
+// between iPhone and iPad.
+@property(nonatomic, strong, readonly)
+    FindBarViewController* findBarViewController;
 
 // Init with incognito style.
 - (instancetype)initWithIncognito:(BOOL)isIncognito;
@@ -29,8 +34,6 @@
 // Updates the results count in Find Bar.
 - (void)updateResultsCount:(FindInPageModel*)model;
 
-// Creates and stores a find bar view to be presented later.
-- (UIView*)createFindBarViewWithDarkAppearance:(BOOL)darkAppearance;
 // Alerts the controller that its find bar will hide.
 - (void)findBarViewWillHide;
 // Alerts the controller that its find bar did hide.

ios/chrome/browser/ui/find_bar/find_bar_controller_ios.mm

@@ -15,6 +15,7 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/find_bar/find_bar_constants.h"
 #import "ios/chrome/browser/ui/find_bar/find_bar_view.h"
+#import "ios/chrome/browser/ui/find_bar/find_bar_view_controller.h"
 #import "ios/chrome/browser/ui/image_util/image_util.h"
 #import "ios/chrome/browser/ui/toolbar/public/toolbar_constants.h"
 #include "ios/chrome/browser/ui/util/rtl_geometry.h"
@@ -51,9 +52,10 @@ const NSTimeInterval kSearchShortDelay = 0.100;
 // will read "Select All" instead of a11y label.
 - (void)selectAllText;
 
-// The view containing all the buttons and textfields that is common between
-// iPhone and iPad.
-@property(nonatomic, strong) FindBarView* findBarView;
+// Redefined to be readwrite
+@property(nonatomic, strong, readwrite)
+    FindBarViewController* findBarViewController;
+
 // Typing delay timer.
 @property(nonatomic, strong) NSTimer* delayTimer;
 // Yes if incognito.
@@ -74,57 +76,62 @@ const NSTimeInterval kSearchShortDelay = 0.100;
 
 #pragma mark - Public
 
-- (UIView*)createFindBarViewWithDarkAppearance:(BOOL)darkAppearance {
-  if (self.findBarView) {
-    return self.findBarView;
+- (FindBarViewController*)findBarViewController {
+  if (_findBarViewController) {
+    return _findBarViewController;
   }
-  self.findBarView =
-      [[FindBarView alloc] initWithDarkAppearance:darkAppearance];
-  self.findBarView.translatesAutoresizingMaskIntoConstraints = NO;
-
-  self.findBarView.inputField.delegate = self;
-  [self.findBarView.inputField addTarget:self
-                                  action:@selector(editingChanged)
-                        forControlEvents:UIControlEventEditingChanged];
-  [self.findBarView.nextButton addTarget:self.dispatcher
-                                  action:@selector(findNextStringInPage)
-                        forControlEvents:UIControlEventTouchUpInside];
-  [self.findBarView.nextButton addTarget:self
-                                  action:@selector(hideKeyboard:)
-                        forControlEvents:UIControlEventTouchUpInside];
-  [self.findBarView.previousButton addTarget:self.dispatcher
-                                      action:@selector(findPreviousStringInPage)
-                            forControlEvents:UIControlEventTouchUpInside];
-  [self.findBarView.previousButton addTarget:self
-                                      action:@selector(hideKeyboard:)
-                            forControlEvents:UIControlEventTouchUpInside];
-  [self.findBarView.closeButton addTarget:self.dispatcher
-                                   action:@selector(closeFindInPage)
-                         forControlEvents:UIControlEventTouchUpInside];
-
-  return self.findBarView;
+  _findBarViewController =
+      [[FindBarViewController alloc] initWithDarkAppearance:self.isIncognito];
+
+  _findBarViewController.findBarView.inputField.delegate = self;
+  [_findBarViewController.findBarView.inputField
+             addTarget:self
+                action:@selector(editingChanged)
+      forControlEvents:UIControlEventEditingChanged];
+  [_findBarViewController.findBarView.nextButton
+             addTarget:self.dispatcher
+                action:@selector(findNextStringInPage)
+      forControlEvents:UIControlEventTouchUpInside];
+  [_findBarViewController.findBarView.nextButton
+             addTarget:self
+                action:@selector(hideKeyboard:)
+      forControlEvents:UIControlEventTouchUpInside];
+  [_findBarViewController.findBarView.previousButton
+             addTarget:self.dispatcher
+                action:@selector(findPreviousStringInPage)
+      forControlEvents:UIControlEventTouchUpInside];
+  [_findBarViewController.findBarView.previousButton
+             addTarget:self
+                action:@selector(hideKeyboard:)
+      forControlEvents:UIControlEventTouchUpInside];
+  [_findBarViewController.findBarView.closeButton
+             addTarget:self.dispatcher
+                action:@selector(closeFindInPage)
+      forControlEvents:UIControlEventTouchUpInside];
+
+  return _findBarViewController;
 }
 
 - (void)findBarViewWillHide {
-  self.findBarView.inputField.selectedTextRange = nil;
+  self.findBarViewController.findBarView.inputField.selectedTextRange = nil;
   [self.delayTimer invalidate];
   self.delayTimer = nil;
 }
 
 - (void)findBarViewDidHide {
-  self.findBarView = nil;
+  self.findBarViewController = nil;
 }
 
 - (NSString*)searchTerm {
-  return [self.findBarView.inputField text];
+  return [self.findBarViewController.findBarView.inputField text];
 }
 
 - (BOOL)isFindInPageShown {
-  return self.findBarView != nil;
+  return self.findBarViewController.findBarView != nil;
 }
 
 - (BOOL)isFocused {
-  return [self.findBarView.inputField isFirstResponder];
+  return [self.findBarViewController.findBarView.inputField isFirstResponder];
 }
 
 - (void)updateResultsCount:(FindInPageModel*)model {
@@ -141,15 +148,15 @@ const NSTimeInterval kSearchShortDelay = 0.100;
 
   if (initialUpdate) {
     // Set initial text and first search.
-    [self.findBarView.inputField setText:model.text];
+    [self.findBarViewController.findBarView.inputField setText:model.text];
     [self editingChanged];
   }
 
   // Focus input field if necessary.
   if (focusTextfield) {
-    [self.findBarView.inputField becomeFirstResponder];
+    [self.findBarViewController.findBarView.inputField becomeFirstResponder];
   } else {
-    [self.findBarView.inputField resignFirstResponder];
+    [self.findBarViewController.findBarView.inputField resignFirstResponder];
   }
 
   [self updateWithMatchNumber:model.currentIndex
@@ -168,22 +175,26 @@ const NSTimeInterval kSearchShortDelay = 0.100;
                                    base::SysNSStringToUTF16(indexStr),
                                    base::SysNSStringToUTF16(matchesStr));
   }
-  [self.findBarView updateResultsLabelWithText:text];
+  [self.findBarViewController.findBarView updateResultsLabelWithText:text];
 
   BOOL enabled = matchCount != 0;
-  self.findBarView.nextButton.enabled = enabled;
-  self.findBarView.previousButton.enabled = enabled;
+  self.findBarViewController.findBarView.nextButton.enabled = enabled;
+  self.findBarViewController.findBarView.previousButton.enabled = enabled;
 }
 
 - (void)hideKeyboard:(id)sender {
-  [self.findBarView endEditing:YES];
+  [self.findBarViewController.findBarView endEditing:YES];
 }
 
 - (void)selectAllText {
-  UITextRange* wholeTextRange = [self.findBarView.inputField
-      textRangeFromPosition:self.findBarView.inputField.beginningOfDocument
-                 toPosition:self.findBarView.inputField.endOfDocument];
-  self.findBarView.inputField.selectedTextRange = wholeTextRange;
+  UITextRange* wholeTextRange =
+      [self.findBarViewController.findBarView.inputField
+          textRangeFromPosition:self.findBarViewController.findBarView
+                                    .inputField.beginningOfDocument
+                     toPosition:self.findBarViewController.findBarView
+                                    .inputField.endOfDocument];
+  self.findBarViewController.findBarView.inputField.selectedTextRange =
+      wholeTextRange;
 }
 
 #pragma mark - Internal
@@ -212,7 +223,7 @@ const NSTimeInterval kSearchShortDelay = 0.100;
 #pragma mark - UITextFieldDelegate
 
 - (BOOL)textFieldShouldBeginEditing:(UITextField*)textField {
-  DCHECK(textField == self.findBarView.inputField);
+  DCHECK(textField == self.findBarViewController.findBarView.inputField);
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kFindBarTextFieldWillBecomeFirstResponderNotification
                     object:self];
@@ -220,15 +231,15 @@ const NSTimeInterval kSearchShortDelay = 0.100;
 }
 
 - (void)textFieldDidEndEditing:(UITextField*)textField {
-  DCHECK(textField == self.findBarView.inputField);
+  DCHECK(textField == self.findBarViewController.findBarView.inputField);
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kFindBarTextFieldDidResignFirstResponderNotification
                     object:self];
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField*)textField {
-  DCHECK(textField == self.findBarView.inputField);
-  [self.findBarView.inputField resignFirstResponder];
+  DCHECK(textField == self.findBarViewController.findBarView.inputField);
+  [self.findBarViewController.findBarView.inputField resignFirstResponder];
   return YES;
 }
 

ios/chrome/browser/ui/find_bar/find_bar_view_controller.h

+// Copyright 2019 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.
+
+#ifndef IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_VIEW_CONTROLLER_H_
+
+#import <UIKit/UIKit.h>
+
+@class FindBarView;
+
+@interface FindBarViewController : UIViewController
+
+- (instancetype)initWithDarkAppearance:(BOOL)darkAppearance
+    NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithNibName:(NSString*)nibNameOrNil
+                         bundle:(NSBundle*)nibBundleOrNil NS_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder*)coder NS_UNAVAILABLE;
+
+// The FindBarView managed by this view controller. This is the same as the
+// |view| property.
+@property(nonatomic, strong, readonly) FindBarView* findBarView;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/find_bar/find_bar_view_controller.mm

+// Copyright 2019 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/find_bar/find_bar_view_controller.h"
+
+#include "base/mac/foundation_util.h"
+#import "ios/chrome/browser/ui/find_bar/find_bar_view.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+@interface FindBarViewController ()
+
+@property(nonatomic, assign) BOOL darkAppearance;
+
+@end
+
+@implementation FindBarViewController
+
+- (instancetype)initWithDarkAppearance:(BOOL)darkAppearance {
+  if (self = [super initWithNibName:nil bundle:nil]) {
+    _darkAppearance = darkAppearance;
+  }
+  return self;
+}
+
+#pragma mark - UIView
+
+- (void)loadView {
+  self.view = [[FindBarView alloc] initWithDarkAppearance:self.darkAppearance];
+  self.view.translatesAutoresizingMaskIntoConstraints = NO;
+}
+
+#pragma mark - Property Getters
+
+- (FindBarView*)findBarView {
+  return base::mac::ObjCCastStrict<FindBarView>(self.view);
+}
+
+@end

ios/chrome/browser/ui/toolbar/accessory/BUILD.gn

@@ -13,6 +13,7 @@ source_set("accessory") {
     "//base",
     "//base:i18n",
     "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/toolbar/public:constants",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/common/colors",

ios/chrome/browser/ui/toolbar/accessory/toolbar_accessory_presenter.h

@@ -7,34 +7,20 @@
 
 #import <UIKit/UIKit.h>
 
+#import "ios/chrome/browser/ui/presenters/contained_presenter.h"
+
 // Presenter that displays accessories over or next to the toolbar. Note that
 // there are different presentations styles for iPhone (Compact Toolbar) vs.
 // iPad. This is used by Find in Page.
-@interface ToolbarAccessoryPresenter : NSObject
+@interface ToolbarAccessoryPresenter : NSObject <ContainedPresenter>
 
-// When presenting views, this presenter will add them into the
-// |baseViewController|.
-- (instancetype)initWithBaseViewController:(UIViewController*)baseViewController
-                               isIncognito:(BOOL)isIncognito
-    NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithIsIncognito:(BOOL)isIncognito NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 
 // The main presented view.
 @property(nonatomic, strong, readonly) UIView* backgroundView;
 
-// Adds the provided |toolbarAccessoryView| as an accessory. Calls the provided
-// |completion| after adding the view. There can only be one toolbar view
-// presented at a time. If there is a view already presented, this is a no-op.
-- (void)addToolbarAccessoryView:(UIView*)toolbarAccessoryView
-                       animated:(BOOL)animated
-                     completion:(void (^)())completion;
-
-// Hides an already-presented view. This must be done before presenting a
-// different view.
-- (void)hideToolbarAccessoryViewAnimated:(BOOL)animated
-                              completion:(void (^)())completion;
-
 @end
 
 #endif  // IOS_CHROME_BROWSER_UI_TOOLBAR_ACCESSORY_TOOLBAR_ACCESSORY_PRESENTER_H_