Add CommandDispatcher to BrowserViewController.

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

 // Copyright 2013 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_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/context_menu/context_menu_coordinator.h"
+#import "ios/chrome/browser/ui/ntp/google_landing_commands.h"
 #import "ios/chrome/browser/ui/ntp/google_landing_data_source.h"
 #import "ios/chrome/browser/ui/ntp/most_visited_cell.h"
 #import "ios/chrome/browser/ui/ntp/most_visited_layout.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_constants.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_header_view.h"
 #import "ios/chrome/browser/ui/ntp/whats_new_header_view.h"
 #import "ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.h"
+#import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/common/string_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 188 matching lines @@
 
 @end
 
 @implementation GoogleLandingController
 
 @dynamic view;
 @synthesize logoVendor = _logoVendor;
 @synthesize dataSource = _dataSource;
 // Property declared in NewTabPagePanelProtocol.
 @synthesize delegate = _delegate;
+@synthesize dispatcher = _dispatcher;
 @synthesize isOffTheRecord = _isOffTheRecord;
 @synthesize logoIsShowing = _logoIsShowing;
 @synthesize promoText = _promoText;
 @synthesize promoIcon = _promoIcon;
 @synthesize promoCanShow = _promoCanShow;
 @synthesize maximumMostVisitedSitesShown = _maximumMostVisitedSitesShown;
 @synthesize tabCount = _tabCount;
 @synthesize voiceSearchIsEnabled = _voiceSearchIsEnabled;
 
 - (void)loadView {
@@ skipping 506 matching lines @@
           [[_mostVisitedView collectionViewLayout] invalidateLayout];
         }
       }
       completion:^(BOOL finished) {
         // Check to see if we are still scrolled to the top -- it's possible
         // (and difficult) to resign the first responder and initiate a
         // -shiftTilesDown before the animation here completes.
         if (_scrolledToTop) {
           _animateHeader = NO;
           if (!IsIPadIdiom()) {
-            [self.dataSource onFakeboxAnimationComplete];
+            [self.dispatcher onFakeboxAnimationComplete];
             [_headerView fadeOutShadow];
             [_searchTapTarget setHidden:YES];
           }
         }
       }];
 }
 
 - (void)searchFieldTapped:(id)sender {
-  [self.dataSource focusFakebox];
+  [self.dispatcher focusFakebox];
 }
 
 - (void)blurOmnibox {
   if (_omniboxFocused) {
-    [self.dataSource cancelOmniboxEdit];
+    [self.dispatcher cancelOmniboxEdit];
   } else {
     [self locationBarResignsFirstResponder];
   }
 }
 
 - (void)locationBarResignsFirstResponder {
   if (!_isShowing && !_scrolledToTop)
     return;
 
   _omniboxFocused = NO;
   if ([_contextMenuCoordinator isVisible]) {
     return;
   }
 
   [self shiftTilesDown];
 }
 
 - (void)shiftTilesDown {
   _animateHeader = YES;
   _scrolledToTop = NO;
   if (!IsIPadIdiom()) {
     [_searchTapTarget setHidden:NO];
-    [self.dataSource onFakeboxBlur];
+    [self.dispatcher onFakeboxBlur];
   }
 
   // Reload most visited sites in case the number of placeholder cells needs to
   // be updated after an orientation change.
   [_mostVisitedView reloadData];
 
   // Reshow views that are within range of the most visited collection view
   // (if necessary).
   [self.view removeGestureRecognizer:_tapGestureRecognizer];
   [self.view removeGestureRecognizer:_swipeGestureRecognizer];
@@ skipping 127 matching lines @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
                                  static_cast<int64_t>(1 * NSEC_PER_SEC)),
                    dispatch_get_main_queue(), ^{
                      [blockView release];
                    });
   }
 
   const NSUInteger visitedIndex = indexPath.row;
   [self blurOmnibox];
   DCHECK(visitedIndex < [self numberOfItems]);
-  [self.dataSource logMostVisitedClick:visitedIndex tileType:cell.tileType];
-  [self.dataSource loadURL:[self urlForIndex:visitedIndex]
+  [self.dispatcher logMostVisitedClick:visitedIndex tileType:cell.tileType];
+  [self.dispatcher loadURL:[self urlForIndex:visitedIndex]
                   referrer:web::Referrer()
                 transition:ui::PAGE_TRANSITION_AUTO_BOOKMARK
          rendererInitiated:NO];
 }
 
 #pragma mark - UICollectionViewDataSource
 
 - (UICollectionReusableView*)collectionView:(UICollectionView*)collectionView
           viewForSupplementaryElementOfKind:(NSString*)kind
                                 atIndexPath:(NSIndexPath*)indexPath {
   DCHECK(kind == UICollectionElementKindSectionHeader);
 
   if (!_supplementaryViews)
     _supplementaryViews.reset([[NSMutableArray alloc] init]);
 
   if (indexPath.section == SectionWithOmnibox) {
     if (!_headerView) {
       _headerView.reset([[collectionView
           dequeueReusableSupplementaryViewOfKind:
               UICollectionElementKindSectionHeader
                              withReuseIdentifier:@"header"
                                     forIndexPath:indexPath] retain]);
       [_headerView addSubview:[self.logoVendor view]];
       [_headerView addSubview:_searchTapTarget];
       [_headerView addViewsToSearchField:_searchTapTarget];
 
       if (!IsIPadIdiom()) {
         // iPhone header also contains a toolbar since the normal toolbar is
         // hidden.
-        [_headerView addToolbarWithDataSource:self.dataSource];
+        [_headerView addToolbarWithDataSource:self.dataSource
+                                   dispatcher:self.dispatcher];
         [_headerView setToolbarTabCount:self.tabCount];
       }
       [_supplementaryViews addObject:_headerView];
     }
     return _headerView;
   }
 
   if (indexPath.section == SectionWithMostVisited) {
     if (!_promoHeaderView) {
       _promoHeaderView.reset([[collectionView
           dequeueReusableSupplementaryViewOfKind:
               UICollectionElementKindSectionHeader
                              withReuseIdentifier:@"whatsNew"
                                     forIndexPath:indexPath] retain]);
       [_promoHeaderView setSideMargin:[self leftMargin]];
       [_promoHeaderView setDelegate:self];
       if (self.promoCanShow) {
         [_promoHeaderView setText:self.promoText];
         [_promoHeaderView setIcon:self.promoIcon];
-        [self.dataSource promoViewed];
+        [self.dispatcher promoViewed];
       }
       [_supplementaryViews addObject:_promoHeaderView];
     }
     return _promoHeaderView;
   }
 
   NOTREACHED();
   return nil;
 }
 
@@ skipping 88 matching lines @@
 
     // Open In New Tab.
     GURL url = [self urlForIndex:index];
     base::WeakNSObject<GoogleLandingController> weakSelf(self);
     action = ^{
       base::scoped_nsobject<GoogleLandingController> strongSelf(
           [weakSelf retain]);
       if (!strongSelf)
         return;
       MostVisitedCell* cell = (MostVisitedCell*)sender.view;
-      [strongSelf.get().dataSource logMostVisitedClick:index
+      [strongSelf.get().dispatcher logMostVisitedClick:index
                                               tileType:cell.tileType];
-      [strongSelf.get().dataSource webPageOrderedOpen:url
+      [strongSelf.get().dispatcher webPageOrderedOpen:url
                                              referrer:web::Referrer()
                                          inBackground:YES
                                              appendTo:kCurrentTab];
     };
     [_contextMenuCoordinator
         addItemWithTitle:l10n_util::GetNSStringWithFixup(
                              IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWTAB)
                   action:action];
 
     if (!self.isOffTheRecord) {
       // Open in Incognito Tab.
       action = ^{
         base::scoped_nsobject<GoogleLandingController> strongSelf(
             [weakSelf retain]);
         if (!strongSelf)
           return;
         MostVisitedCell* cell = (MostVisitedCell*)sender.view;
-        [strongSelf.get().dataSource logMostVisitedClick:index
+        [strongSelf.get().dispatcher logMostVisitedClick:index
                                                 tileType:cell.tileType];
-        [strongSelf.get().dataSource webPageOrderedOpen:url
+        [strongSelf.get().dispatcher webPageOrderedOpen:url
                                                referrer:web::Referrer()
                                             inIncognito:YES
                                            inBackground:NO
                                                appendTo:kCurrentTab];
       };
       [_contextMenuCoordinator
           addItemWithTitle:l10n_util::GetNSStringWithFixup(
                                IDS_IOS_CONTENT_CONTEXT_OPENLINKNEWINCOGNITOTAB)
                     action:action];
     }
 
     // Remove the most visited url.
     NSString* title =
         l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK);
     action = ^{
       base::scoped_nsobject<GoogleLandingController> strongSelf(
           [weakSelf retain]);
       // Early return if the controller has been deallocated.
       if (!strongSelf)
         return;
       base::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted"));
-      [strongSelf.get().dataSource addBlacklistedURL:url];
+      [strongSelf.get().dispatcher addBlacklistedURL:url];
       [strongSelf showMostVisitedUndoForURL:net::NSURLWithGURL(url)];
     };
     [_contextMenuCoordinator addItemWithTitle:title action:action];
 
     [_contextMenuCoordinator start];
 
     if (IsIPadIdiom())
       [self blurOmnibox];
   }
 }
 
 - (void)showMostVisitedUndoForURL:(NSURL*)url {
   _deletedUrl.reset([url retain]);
 
   MDCSnackbarMessageAction* action =
       [[[MDCSnackbarMessageAction alloc] init] autorelease];
   base::WeakNSObject<GoogleLandingController> weakSelf(self);
   action.handler = ^{
     base::scoped_nsobject<GoogleLandingController> strongSelf(
         [weakSelf retain]);
     if (!strongSelf)
       return;
-    [strongSelf.get().dataSource
+    [strongSelf.get().dispatcher
         removeBlacklistedURL:net::GURLWithNSURL(_deletedUrl)];
   };
   action.title = l10n_util::GetNSString(IDS_NEW_TAB_UNDO_THUMBNAIL_REMOVE);
   action.accessibilityIdentifier = @"Undo";
 
   TriggerHapticFeedbackForNotification(UINotificationFeedbackTypeSuccess);
   MDCSnackbarMessage* message = [MDCSnackbarMessage
       messageWithText:l10n_util::GetNSString(
                           IDS_IOS_NEW_TAB_MOST_VISITED_ITEM_REMOVED)];
   message.action = action;
   message.category = @"MostVisitedUndo";
   [MDCSnackbarManager showMessage:message];
 }
 
 - (void)onPromoLabelTapped {
-  [self.dataSource cancelOmniboxEdit];
+  [self.dispatcher cancelOmniboxEdit];
   [_promoHeaderView setHidden:YES];
   [self.view setNeedsLayout];
-  [self.dataSource promoTapped];
+  [self.dispatcher promoTapped];
 }
 
 // Returns the Y value to use for the scroll view's contentOffset when scrolling
 // the omnibox to the top of the screen.
 - (CGFloat)pinnedOffsetY {
   CGFloat headerHeight = [_headerView frame].size.height;
   CGFloat offsetY =
       headerHeight - ntp_header::kScrolledToTopOmniboxBottomMargin;
   if (!IsIPadIdiom())
     offsetY -= ntp_header::kToolbarHeight;
@@ skipping 73 matching lines @@
 #pragma mark - UIScrollViewDelegate Methods.
 
 - (void)scrollViewDidScroll:(UIScrollView*)scrollView {
   [self.delegate updateNtpBarShadowForPanelController:self];
   [_overscrollActionsController scrollViewDidScroll:scrollView];
 
   // Blur the omnibox when the scroll view is scrolled below the pinned offset.
   CGFloat pinnedOffsetY = [self pinnedOffsetY];
   if (_omniboxFocused && scrollView.dragging &&
       scrollView.contentOffset.y < pinnedOffsetY) {
-    [self.dataSource cancelOmniboxEdit];
+    [self.dispatcher cancelOmniboxEdit];
   }
 
   if (IsIPadIdiom()) {
     return;
   }
 
   if (_animateHeader) {
     [self updateSearchField];
   }
 }
@@ skipping 167 matching lines @@
       [NSIndexPath indexPathForRow:index inSection:SectionWithMostVisited];
   [_mostVisitedView reloadItemsAtIndexPaths:@[ indexPath ]];
 }
 
 - (void)setTabCount:(int)tabCount {
   _tabCount = tabCount;
   [_headerView setToolbarTabCount:self.tabCount];
 }
 
 @end