Add CommandDispatcher to BrowserViewController.

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 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/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 151 matching lines @@
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/net/request_tracker.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/ui/app_rating_prompt.h"
 #include "ios/public/provider/chrome/browser/ui/default_ios_web_view_factory.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar_owner.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller_delegate.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
+#import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/shared/chrome/browser/ui/tools_menu/tools_menu_configuration.h"
 #include "ios/web/public/active_state_manager.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer_util.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/user_agent.h"
 #include "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
@@ skipping 211 matching lines @@
 
   // Handles displaying the context menu for all form factors.
   ContextMenuCoordinator* _contextMenuCoordinator;
 
   // Backing object for property of the same name.
   DialogPresenter* _dialogPresenter;
 
   // Handles presentation of JavaScript dialogs.
   std::unique_ptr<JavaScriptDialogPresenterImpl> _javaScriptDialogPresenter;
 
+  // Handles command dispatching.
+  CommandDispatcher* _dispatcher;
+
   // Keyboard commands provider.  It offloads most of the keyboard commands
   // management off of the BVC.
   KeyCommandsProvider* _keyCommandsProvider;
 
   // Calls to |-relinquishedToolbarController| will set this to yes, and calls
   // to |-reparentToolbarController| will reset it to NO.
   BOOL _isToolbarControllerRelinquished;
 
   // The controller that owns the currently relinquished toolbar controller.
   // The reference is weak because it's possible for the toolbar owner to be
@@ skipping 528 matching lines @@
                dependencyFactory:
                    (BrowserViewControllerDependencyFactory*)factory {
   self = [super initWithNibName:nil bundle:base::mac::FrameworkBundle()];
   if (self) {
     DCHECK(factory);
 
     _dependencyFactory = factory;
     _nativeControllersForTabIDs = [NSMapTable strongToWeakObjectsMapTable];
     _dialogPresenter = [[DialogPresenter alloc] initWithDelegate:self
                                         presentingViewController:self];
+    _dispatcher = [[CommandDispatcher alloc] init];
+    [_dispatcher startDispatchingToTarget:self
+                              forProtocol:@protocol(UrlLoader)];
+    [_dispatcher startDispatchingToTarget:self
+                              forProtocol:@protocol(WebToolbarDelegate)];
+
     _javaScriptDialogPresenter.reset(
         new JavaScriptDialogPresenterImpl(_dialogPresenter));
     _webStateDelegate.reset(new web::WebStateDelegateBridge(self));
     // TODO(leng): Delay this.
     [[UpgradeCenter sharedInstance] registerClient:self];
     _inNewTabAnimation = NO;
     if (model && browserState)
       [self updateWithTabModel:model browserState:browserState];
     if ([[NSUserDefaults standardUserDefaults]
             boolForKey:@"fullScreenShowAlert"]) {
       _fullScreenAlertShown = [[NSMutableSet alloc] init];
     }
   }
   return self;
 }
 
 - (instancetype)initWithNibName:(NSString*)nibNameOrNil
                          bundle:(NSBundle*)nibBundleOrNil {
   NOTREACHED();
   return nil;
 }
 
 - (instancetype)initWithCoder:(NSCoder*)aDecoder {
   NOTREACHED();
   return nil;
 }
 
 - (void)dealloc {
+  [_dispatcher stopDispatchingForProtocol:@protocol(OmniboxFocuser)];
+  [_dispatcher stopDispatchingForProtocol:@protocol(UrlLoader)];
+  [_dispatcher stopDispatchingForProtocol:@protocol(WebToolbarDelegate)];
+
   _tabStripController = nil;
   _infoBarContainer = nil;
   _readingListMenuNotifier = nil;
   if (_bookmarkModel)
     _bookmarkModel->RemoveObserver(_bookmarkModelBridge.get());
   [_model removeObserver:self];
   [[UpgradeCenter sharedInstance] unregisterClient:self];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [_toolbarController setDelegate:nil];
   if (_voiceSearchController)
@@ skipping 766 matching lines @@
 
   // Create the toolbar model and controller.
   _toolbarModelDelegate.reset(
       new ToolbarModelDelegateIOS([_model webStateList]));
   _toolbarModelIOS.reset([_dependencyFactory
       newToolbarModelIOSWithDelegate:_toolbarModelDelegate.get()]);
   _toolbarController = [_dependencyFactory
       newWebToolbarControllerWithDelegate:self
                                 urlLoader:self
                           preloadProvider:_preloadController];
+  [_dispatcher startDispatchingToTarget:_toolbarController
+                            forProtocol:@protocol(OmniboxFocuser)];
   [_toolbarController setTabCount:[_model count]];
   if (_voiceSearchController)
     _voiceSearchController->SetDelegate(_toolbarController);
 
   // If needed, create the tabstrip.
   if (IsIPadIdiom()) {
     _tabStripController =
         [_dependencyFactory newTabStripControllerWithTabModel:_model];
     _tabStripController.fullscreenDelegate = self;
   }
@@ skipping 1247 matching lines @@
   if (url_host == kChromeUINewTabHost || url_host == kChromeUIBookmarksHost) {
     NewTabPageController* pageController =
         [[NewTabPageController alloc] initWithUrl:url
                                            loader:self
                                           focuser:_toolbarController
                                       ntpObserver:self
                                      browserState:_browserState
                                        colorCache:_dominantColorCache
                                webToolbarDelegate:self
                                          tabModel:_model
-                             parentViewController:self];
+                             parentViewController:self
+                                       dispatcher:_dispatcher];
     pageController.swipeRecognizerProvider = self.sideSwipeController;
 
     // Panel is always NTP for iPhone.
     NewTabPage::PanelIdentifier panelType = NewTabPage::kMostVisitedPanel;
 
     if (IsIPadIdiom()) {
       // New Tab Page can have multiple panels. Each panel is addressable
       // by a #fragment, e.g. chrome://newtab/#most_visited takes user to
       // the Most Visited page, chrome://newtab/#bookmarks takes user to
       // the Bookmark Manager, etc.
@@ skipping 2125 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end