[ios] Creates InfobarCommands protocol.

- InfobarCommands will be used by the LocationBar badge button to
communicate with the InfobarContainer and display the InfobarModal
whenever the button is tapped.

Bug: 911864
Change-Id: Ib0126ce8d8de9378d91606f9a76855ff882cbc9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1500605
Commit-Queue: Sergio Collazos <sczs@chromium.org>
Reviewed-by: Chris Lu <thegreenfrog@chromium.org>
Reviewed-by: Peter Lee <pkl@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638188}

ios/chrome/browser/ui/browser_view_controller.mm

@@ -2018,7 +2018,7 @@ NSString* const kBrowserViewControllerSnackbarCategory =
       initWithBaseViewController:self
                     browserState:_browserState
                         tabModel:self.tabModel];
-  self.infobarContainerCoordinator.dispatcher = self.dispatcher;
+  self.infobarContainerCoordinator.commandDispatcher = self.dispatcher;
   self.infobarContainerCoordinator.positioner = self;
   self.infobarContainerCoordinator.syncPresenter = self;
   [self.infobarContainerCoordinator start];

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

@@ -12,6 +12,7 @@ source_set("commands") {
     "browsing_data_commands.h",
     "command_dispatcher.h",
     "command_dispatcher.mm",
+    "infobar_commands.h",
     "load_query_commands.h",
     "omnibox_suggestion_commands.h",
     "open_new_tab_command.h",

ios/chrome/browser/ui/commands/browser_commands.h

@@ -10,6 +10,7 @@
 
 #import "ios/chrome/browser/ui/commands/activity_service_commands.h"
 #import "ios/chrome/browser/ui/commands/browser_coordinator_commands.h"
+#import "ios/chrome/browser/ui/commands/infobar_commands.h"
 #import "ios/chrome/browser/ui/commands/page_info_commands.h"
 #import "ios/chrome/browser/ui/commands/popup_menu_commands.h"
 #import "ios/chrome/browser/ui/commands/qr_scanner_commands.h"
@@ -23,13 +24,14 @@ class GURL;
 // which in practice is the BrowserViewController instance displaying the tab.
 // TODO(crbug.com/906662) : Extract BrowserCoordinatorCommands from
 // BrowserCommands.
-@protocol BrowserCommands<NSObject,
-                          ActivityServiceCommands,
-                          BrowserCoordinatorCommands,
-                          PageInfoCommands,
-                          PopupMenuCommands,
-                          QRScannerCommands,
-                          SnackbarCommands>
+@protocol BrowserCommands <NSObject,
+                           ActivityServiceCommands,
+                           BrowserCoordinatorCommands,
+                           InfobarCommands,
+                           PageInfoCommands,
+                           PopupMenuCommands,
+                           QRScannerCommands,
+                           SnackbarCommands>
 
 // Closes the current tab.
 - (void)closeCurrentTab;

ios/chrome/browser/ui/commands/infobar_commands.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_COMMANDS_INFOBAR_COMMANDS_H_
+#define IOS_CHROME_BROWSER_UI_COMMANDS_INFOBAR_COMMANDS_H_
+
+// TODO(crbug.com/935804): This protocol is currently only being used in the
+// Infobar redesign.
+@protocol InfobarCommands <NSObject>
+
+// Displays the InfobarModal for the InfobarBadge.
+- (void)displayModalInfobar;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_COMMANDS_INFOBAR_COMMANDS_H_

ios/chrome/browser/ui/infobars/infobar_container_coordinator.h

@@ -11,8 +11,8 @@ namespace web {
 class WebState;
 }
 
+@class CommandDispatcher;
 @class TabModel;
-@protocol ApplicationCommands;
 @protocol InfobarPositioner;
 @protocol SyncPresenter;
 
@@ -49,8 +49,8 @@ class WebState;
 // YES if an Infobar is being presented for |webState|.
 - (BOOL)isInfobarPresentingForWebState:(web::WebState*)webState;
 
-// The dispatcher for this Coordinator.
-@property(nonatomic, weak) id<ApplicationCommands> dispatcher;
+// The CommandDispatcher for this Coordinator.
+@property(nonatomic, weak) CommandDispatcher* commandDispatcher;
 
 // The delegate used to position the InfobarContainer in the view.
 @property(nonatomic, weak) id<InfobarPositioner> positioner;

ios/chrome/browser/ui/infobars/infobar_container_coordinator.mm

@@ -9,6 +9,7 @@
 #import "base/mac/foundation_util.h"
 #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
 #import "ios/chrome/browser/ui/commands/application_commands.h"
+#import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller_factory.h"
 #import "ios/chrome/browser/ui/infobars/coordinators/infobar_coordinating.h"
 #import "ios/chrome/browser/ui/infobars/infobar_container_consumer.h"
@@ -39,6 +40,8 @@
     LegacyInfobarContainerViewController* legacyContainerViewController;
 // The mediator for this Coordinator.
 @property(nonatomic, strong) InfobarContainerMediator* mediator;
+// The dispatcher for this Coordinator.
+@property(nonatomic, weak) id<ApplicationCommands> dispatcher;
 
 @end
 
@@ -120,6 +123,23 @@
   return NO;
 }
 
+#pragma mark - Accessors
+
+- (void)setCommandDispatcher:(CommandDispatcher*)commandDispatcher {
+  if (commandDispatcher == self.commandDispatcher) {
+    return;
+  }
+
+  if (self.commandDispatcher) {
+    [self.commandDispatcher stopDispatchingToTarget:self];
+  }
+
+  [commandDispatcher startDispatchingToTarget:self
+                                  forSelector:@selector(displayModalInfobar)];
+  _commandDispatcher = commandDispatcher;
+  self.dispatcher = static_cast<id<ApplicationCommands>>(_commandDispatcher);
+}
+
 #pragma mark - InfobarConsumer
 
 - (void)addInfoBarWithDelegate:(id<InfobarUIDelegate>)infoBarDelegate
@@ -150,6 +170,12 @@
   // since we use autolayout for the contained Infobars.
 }
 
+#pragma mark - InfobarCommands
+
+- (void)displayModalInfobar {
+  // TODO(crbug.com/911864): To be implemented.
+}
+
 #pragma mark - UIViewControllerTransitioningDelegate
 
 - (UIPresentationController*)

ios/chrome/browser/ui/location_bar/location_bar_view_controller.h

@@ -15,6 +15,7 @@
 @protocol ActivityServiceCommands;
 @protocol ApplicationCommands;
 @protocol BrowserCommands;
+@protocol InfobarCommands;
 @protocol LocationBarOffsetProvider;
 @protocol LoadQueryCommands;
 
@@ -43,8 +44,9 @@
 
 // The dispatcher for the share button, voice search, and long press actions.
 @property(nonatomic, weak) id<ActivityServiceCommands,
-                              BrowserCommands,
                               ApplicationCommands,
+                              BrowserCommands,
+                              InfobarCommands,
                               LoadQueryCommands>
     dispatcher;
 

ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm

@@ -13,6 +13,7 @@
 #import "ios/chrome/browser/ui/commands/activity_service_commands.h"
 #import "ios/chrome/browser/ui/commands/application_commands.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
+#import "ios/chrome/browser/ui/commands/infobar_commands.h"
 #import "ios/chrome/browser/ui/commands/load_query_commands.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_animator.h"
 #import "ios/chrome/browser/ui/infobars/infobar_feature.h"
@@ -437,6 +438,10 @@ typedef NS_ENUM(int, TrailingButtonState) {
       setImage:[[UIImage imageNamed:@"infobar_passwords_icon"]
                    imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]
       forState:UIControlStateNormal];
+  [self.locationBarSteadyView.leadingButton
+             addTarget:self.dispatcher
+                action:@selector(displayModalInfobar)
+      forControlEvents:UIControlEventTouchUpInside];
   self.locationBarSteadyView.leadingButton.tintColor = [UIColor lightGrayColor];
   // Set as hidden as it should only be shown by |displayInfobarButton:|
   self.locationBarSteadyView.leadingButton.hidden = YES;