Add CommandDispatcher to BrowserViewController.

ios/chrome/browser/ui/ntp/google_landing_mediator.mm

 // Copyright 2017 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/ntp/google_landing_mediator.h"
 
 #import "base/ios/weak_nsobject.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/ntp_tiles/metrics.h"
 #include "components/ntp_tiles/most_visited_sites.h"
 #include "components/ntp_tiles/ntp_tile.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/search_engines/template_url_service_observer.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_cache_factory.h"
 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_service_factory.h"
 #import "ios/chrome/browser/metrics/new_tab_page_uma.h"
 #include "ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.h"
 #import "ios/chrome/browser/ntp_tiles/most_visited_sites_observer_bridge.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
+#import "ios/chrome/browser/ui/ntp/google_landing_commands.h"
 #import "ios/chrome/browser/ui/ntp/google_landing_consumer.h"
 #import "ios/chrome/browser/ui/ntp/notification_promo_whats_new.h"
 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
 #import "ios/chrome/browser/ui/url_loader.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/browser/web_state_list/web_state_list_observer_bridge.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
+#import "ios/shared/chrome/browser/ui/commands/command_dispatcher.h"
 #include "ios/web/public/web_state/web_state.h"
 
 using base::UserMetricsAction;
 
 namespace {
 
 const NSInteger kMaxNumMostVisitedFavicons = 8;
 
 }  // namespace
 
@@ skipping 27 matching lines @@
 SearchEngineObserver::~SearchEngineObserver() {
   _templateURLService->RemoveObserver(this);
 }
 
 void SearchEngineObserver::OnTemplateURLServiceChanged() {
   [_owner updateShowLogo];
 }
 
 }  // namespace google_landing
 
-@interface GoogleLandingMediator ()<MostVisitedSitesObserving,
+@interface GoogleLandingMediator ()<GoogleLandingCommands,
+                                    MostVisitedSitesObserving,
                                     WebStateListObserving> {
   // The ChromeBrowserState associated with this mediator.
   ios::ChromeBrowserState* _browserState;  // Weak.
 
   // |YES| if impressions were logged already and shouldn't be logged again.
   BOOL _recordedPageImpression;
 
-  // The designated url loader.
-  id<UrlLoader> _loader;  // Weak.
-
-  // Delegate to focus and blur the omnibox.
-  base::WeakNSProtocol<id<OmniboxFocuser>> _focuser;
-
   // Controller to fetch and show doodles or a default Google logo.
   base::scoped_nsprotocol<id<LogoVendor>> _doodleController;
 
   // Listen for default search engine changes.
   std::unique_ptr<google_landing::SearchEngineObserver> _observer;
   TemplateURLService* _templateURLService;  // weak
 
   // A MostVisitedSites::Observer bridge object to get notified of most visited
   // sites changes.
   std::unique_ptr<ntp_tiles::MostVisitedSitesObserverBridge>
       _mostVisitedObserverBridge;
 
   std::unique_ptr<ntp_tiles::MostVisitedSites> _mostVisitedSites;
 
   // Most visited data from the MostVisitedSites service (copied upon receiving
   // the callback).
   ntp_tiles::NTPTilesVector _mostVisitedData;
 
-  base::WeakNSProtocol<id<WebToolbarDelegate>> _webToolbarDelegate;
-
   // Observes the WebStateList so that this mediator can update the UI when the
   // active WebState changes.
   std::unique_ptr<WebStateListObserverBridge> _webStateListObserver;
 
   // What's new promo.
   std::unique_ptr<NotificationPromoWhatsNew> _notification_promo;
 }
 
 // Consumer to handle google landing update notifications.
 @property(nonatomic) id<GoogleLandingConsumer> consumer;
 
 // The WebStateList that is being observed by this mediator.
 @property(nonatomic, assign) WebStateList* webStateList;
 
 // Perform initial setup.
 - (void)setUp;
 
 @end
 
 @implementation GoogleLandingMediator
 
 @synthesize consumer = _consumer;
+@synthesize dispatcher = _dispatcher;
 @synthesize webStateList = _webStateList;
 
 - (instancetype)initWithConsumer:(id<GoogleLandingConsumer>)consumer
                     browserState:(ios::ChromeBrowserState*)browserState
-                          loader:(id<UrlLoader>)loader
-                         focuser:(id<OmniboxFocuser>)focuser
-              webToolbarDelegate:(id<WebToolbarDelegate>)webToolbarDelegate
                     webStateList:(WebStateList*)webStateList {
   self = [super init];
   if (self) {
     self.consumer = consumer;
     _browserState = browserState;
-    _loader = loader;
-    _focuser.reset(focuser);
-    _webToolbarDelegate.reset(webToolbarDelegate);
     _webStateList = webStateList;
 
     _webStateListObserver = base::MakeUnique<WebStateListObserverBridge>(self);
     _webStateList->AddObserver(_webStateListObserver.get());
 
     [self setUp];
   }
   return self;
 }
 
 - (void)dealloc {
+  [self.dispatcher stopDispatchingForProtocol:@protocol(GoogleLandingCommands)];
   _webStateList->RemoveObserver(_webStateListObserver.get());
   [[NSNotificationCenter defaultCenter] removeObserver:self.consumer];
   [super dealloc];
 }
 
 - (void)setUp {
   self.consumer.isOffTheRecord = _browserState->IsOffTheRecord();
   self.consumer.voiceSearchIsEnabled = ios::GetChromeBrowserProvider()
                                            ->GetVoiceSearchProvider()
                                            ->IsVoiceSearchEnabled();
   self.consumer.maximumMostVisitedSitesShown = [self.class maxSitesShown];
   self.consumer.tabCount = self.webStateList->count();
 
   // Set up template URL service to listen for default search engine changes.
   _templateURLService =
       ios::TemplateURLServiceFactory::GetForBrowserState(_browserState);
   _observer.reset(
       new google_landing::SearchEngineObserver(self, _templateURLService));
   _templateURLService->Load();
   _doodleController.reset(ios::GetChromeBrowserProvider()->CreateLogoVendor(
-      _browserState, _loader));
+      _browserState, self.dispatcher));
   self.consumer.logoVendor = _doodleController;
   [self updateShowLogo];
 
   // Set up most visited sites.  This call may have the side effect of
   // triggering -onMostVisitedURLsAvailable immediately, which can load the
   // view before dataSource is set.
   _mostVisitedSites =
       IOSMostVisitedSitesFactory::NewForBrowserState(_browserState);
   _mostVisitedObserverBridge.reset(
       new ntp_tiles::MostVisitedSitesObserverBridge(self));
@@ skipping 16 matching lines @@
   // Set up what's new.
   _notification_promo.reset(
       new NotificationPromoWhatsNew(GetApplicationContext()->GetLocalState()));
   _notification_promo->Init();
   self.consumer.promoText =
       base::SysUTF8ToNSString(_notification_promo->promo_text());
   self.consumer.promoIcon = _notification_promo->icon();
   self.consumer.promoCanShow = _notification_promo->CanShow();
 }
 
+- (void)setDispatcher:(id)dispatcher {
+  _dispatcher = dispatcher;
+  [self.dispatcher startDispatchingToTarget:self
+                                forProtocol:@protocol(GoogleLandingCommands)];
+}
+
 - (void)updateShowLogo {
   BOOL showLogo = NO;
   TemplateURL* defaultURL = _templateURLService->GetDefaultSearchProvider();
   if (defaultURL) {
     showLogo =
         defaultURL->GetEngineType(_templateURLService->search_terms_data()) ==
         SEARCH_ENGINE_GOOGLE;
   }
   self.consumer.logoIsShowing = showLogo;
 }
@@ skipping 87 matching lines @@
   DCHECK(_notification_promo);
   _notification_promo->HandleViewed();
   self.consumer.promoCanShow = _notification_promo->CanShow();
 }
 - (void)promoTapped {
   DCHECK(_notification_promo);
   _notification_promo->HandleClosed();
   self.consumer.promoCanShow = _notification_promo->CanShow();
 
   if (_notification_promo->IsURLPromo()) {
-    [_loader webPageOrderedOpen:_notification_promo->url()
-                       referrer:web::Referrer()
-                   inBackground:NO
-                       appendTo:kCurrentTab];
+    [self.dispatcher webPageOrderedOpen:_notification_promo->url()
+                               referrer:web::Referrer()
+                           inBackground:NO
+                               appendTo:kCurrentTab];
     return;
   }
 
   if (_notification_promo->IsChromeCommand()) {
     base::scoped_nsobject<GenericChromeCommand> command(
         [[GenericChromeCommand alloc]
             initWithTag:_notification_promo->command_id()]);
-    [self.consumer chromeExecuteCommand:command];
+    [self.dispatcher chromeExecuteCommand:command];

[marq (ping after 24h), 2017/04/20 13:17:14]

Where does the dispatching and handling for this get set up?

[justincohen, 2017/04/20 21:28:31]

in BVC.

     return;
   }
   NOTREACHED();
 }
 
 - (BOOL)canGoForward {
   web::WebState* webState = _webStateList->GetActiveWebState();
   if (webState)
     return webState->GetNavigationManager()->CanGoForward();
   return NO;
 }
 
 - (BOOL)canGoBack {
   web::WebState* webState = _webStateList->GetActiveWebState();
   if (webState)
     return webState->GetNavigationManager()->CanGoBack();
   return NO;
 }
 
-- (void)prepareToEnterTabSwitcher:(id)sender {
-  [_webToolbarDelegate prepareToEnterTabSwitcher:sender];
-}
-
-#pragma mark - UrlLoader
-
-- (void)loadURL:(const GURL&)url
-             referrer:(const web::Referrer&)referrer
-           transition:(ui::PageTransition)transition
-    rendererInitiated:(BOOL)rendererInitiated {
-  [_loader loadURL:url
-               referrer:referrer
-             transition:transition
-      rendererInitiated:rendererInitiated];
-}
-
-- (void)webPageOrderedOpen:(const GURL&)url
-                  referrer:(const web::Referrer&)referrer
-              inBackground:(BOOL)inBackground
-                  appendTo:(OpenPosition)appendTo {
-  [_loader webPageOrderedOpen:url
-                     referrer:referrer
-                 inBackground:inBackground
-                     appendTo:appendTo];
-}
-
-- (void)webPageOrderedOpen:(const GURL&)url
-                  referrer:(const web::Referrer&)referrer
-               inIncognito:(BOOL)inIncognito
-              inBackground:(BOOL)inBackground
-                  appendTo:(OpenPosition)appendTo {
-  [_loader webPageOrderedOpen:url
-                     referrer:referrer
-                  inIncognito:inIncognito
-                 inBackground:inBackground
-                     appendTo:appendTo];
-}
-
-- (void)loadSessionTab:(const sessions::SessionTab*)sessionTab {
-  NOTREACHED();
-}
-
-- (void)loadJavaScriptFromLocationBar:(NSString*)script {
-  NOTREACHED();
-}
-
-#pragma mark - OmniboxFocuser
-
-- (void)focusOmnibox {
-  [_focuser focusOmnibox];
-}
-
-- (void)cancelOmniboxEdit {
-  [_focuser cancelOmniboxEdit];
-}
-
-- (void)focusFakebox {
-  [_focuser focusFakebox];
-}
-
-- (void)onFakeboxBlur {
-  [_focuser onFakeboxBlur];
-}
-
-- (void)onFakeboxAnimationComplete {
-  [_focuser onFakeboxAnimationComplete];
-}
 
 @end