Create an Obj-C bridge for MostVisitedSitesObserver

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/i18n/case_conversion.h"
 #import "base/ios/weak_nsobject.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/favicon/core/large_icon_service.h"
 #include "components/keyed_service/core/service_access_type.h"
+#import "components/ntp_tiles/ios/most_visited_sites_bridge_observer.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 "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/favicon/favicon_loader.h"
 #include "ios/chrome/browser/favicon/favicon_service_factory.h"
@@ skipping 69 matching lines @@
 const NSInteger kMaxNumMostVisitedFavicons = 8;
 const NSInteger kMaxNumMostVisitedFaviconRows = 2;
 const CGFloat kMaxSearchFieldFrameMargin = 200;
 const CGFloat kShiftTilesDownAnimationDuration = 0.2;
 
 const CGFloat kMostVisitedPaddingIPhone = 16;
 const CGFloat kMostVisitedPaddingIPadFavicon = 24;
 
 }  // namespace
 
-@interface GoogleLandingController ()
-- (void)onMostVisitedURLsAvailable:(const ntp_tiles::NTPTilesVector&)data;
-- (void)onIconMadeAvailable:(const GURL&)siteUrl;
-@end
-
 namespace google_landing {
 
-// MostVisitedSitesObserverBridge allow registration as a
-// MostVisitedSites::Observer.
-class MostVisitedSitesObserverBridge
-    : public ntp_tiles::MostVisitedSites::Observer {
- public:
-  MostVisitedSitesObserverBridge(GoogleLandingController* owner);
-  ~MostVisitedSitesObserverBridge() override;
-
-  // MostVisitedSites::Observer implementation.
-  void OnMostVisitedURLsAvailable(
-      const ntp_tiles::NTPTilesVector& most_visited) override;
-  void OnIconMadeAvailable(const GURL& site_url) override;
-
- private:
-  GoogleLandingController* _owner;
-};
-
-MostVisitedSitesObserverBridge::MostVisitedSitesObserverBridge(
-    GoogleLandingController* owner)
-    : _owner(owner) {}
-
-MostVisitedSitesObserverBridge::~MostVisitedSitesObserverBridge() {}
-
-void MostVisitedSitesObserverBridge::OnMostVisitedURLsAvailable(
-    const ntp_tiles::NTPTilesVector& tiles) {
-  [_owner onMostVisitedURLsAvailable:tiles];
-}
-
-void MostVisitedSitesObserverBridge::OnIconMadeAvailable(const GURL& site_url) {
-  [_owner onIconMadeAvailable:site_url];
-}
-
 // Observer used to hide the Google logo and doodle if the TemplateURLService
 // changes.
 class SearchEngineObserver : public TemplateURLServiceObserver {
  public:
   SearchEngineObserver(GoogleLandingController* owner,
                        TemplateURLService* urlService);
   ~SearchEngineObserver() override;
   void OnTemplateURLServiceChanged() override;
 
  private:
@@ skipping 53 matching lines @@
   // To prevent this from happening, we reset the inset to 0 before changing the
   // frame.
   [_googleLanding resetSectionInset];
   [super setFrame:frame];
   [_googleLanding updateSubviewFrames];
   [_googleLanding reloadData];
 }
 
 @end
 
-@interface GoogleLandingController ()<OverscrollActionsControllerDelegate,
+@interface GoogleLandingController ()<MostVisitedSitesObserver,
+                                      OverscrollActionsControllerDelegate,
                                       UICollectionViewDataSource,
                                       UICollectionViewDelegate,
                                       UICollectionViewDelegateFlowLayout,
                                       UIGestureRecognizerDelegate,
                                       WhatsNewHeaderViewDelegate> {
   // The main view.
   base::scoped_nsobject<GoogleLandingView> _view;
 
   // Fake omnibox.
   base::scoped_nsobject<UIButton> _searchTapTarget;
@@ skipping 26 matching lines @@
   base::scoped_nsobject<UISwipeGestureRecognizer> _swipeGestureRecognizer;
 
   // Handles displaying the context menu for all form factors.
   base::scoped_nsobject<ContextMenuCoordinator> _contextMenuCoordinator;
 
   // What's new promo.
   std::unique_ptr<NotificationPromoWhatsNew> _notification_promo;
 
   // A MostVisitedSites::Observer bridge object to get notified of most visited
   // sites changes.
-  std::unique_ptr<google_landing::MostVisitedSitesObserverBridge>
-      _most_visited_observer_bridge;
+  std::unique_ptr<ntp_tiles::MostVisitedSitesBridge> _most_visited_bridge;
 
   std::unique_ptr<ntp_tiles::MostVisitedSites> _most_visited_sites;
 
   // URL of the last deleted most viewed entry. If present the UI to restore it
   // is shown.
   base::scoped_nsobject<NSURL> _deletedUrl;
 
   // Listen for default search engine changes.
   std::unique_ptr<google_landing::SearchEngineObserver> _observer;
   TemplateURLService* _templateURLService;  // weak
@@ skipping 640 matching lines @@
        forSupplementaryViewOfKind:UICollectionElementKindSectionHeader
               withReuseIdentifier:@"whatsNew"];
   [_mostVisitedView registerClass:[NewTabPageHeaderView class]
        forSupplementaryViewOfKind:UICollectionElementKindSectionHeader
               withReuseIdentifier:@"header"];
   [_mostVisitedView setAccessibilityIdentifier:@"Google Landing"];
 
   [_view addSubview:_mostVisitedView];
   _most_visited_sites =
       IOSMostVisitedSitesFactory::NewForBrowserState(_browserState);
-  _most_visited_observer_bridge.reset(
-      new google_landing::MostVisitedSitesObserverBridge(self));
-  _most_visited_sites->SetMostVisitedURLsObserver(
-      _most_visited_observer_bridge.get(), kMaxNumMostVisitedFavicons);
+  _most_visited_bridge.reset(new ntp_tiles::MostVisitedSitesBridge(self));
+  _most_visited_sites->SetMostVisitedURLsObserver(_most_visited_bridge.get(),
+                                                  kMaxNumMostVisitedFavicons);
 }
 
 - (void)updateSearchField {
   NSArray* constraints =
       @[ _hintLabelLeadingConstraint, _voiceTapTrailingConstraint ];
   [_headerView updateSearchField:_searchTapTarget
                 withInitialFrame:[self searchFieldFrame]
               subviewConstraints:constraints
                        forOffset:[_mostVisitedView contentOffset].y];
 }
@@ skipping 143 matching lines @@
 
 - (void)logMostVisitedClick:(const NSUInteger)visitedIndex
                    tileType:(ntp_tiles::metrics::MostVisitedTileType)tileType {
   new_tab_page_uma::RecordAction(
       _browserState, new_tab_page_uma::ACTION_OPENED_MOST_VISITED_ENTRY);
   base::RecordAction(UserMetricsAction("MobileNTPMostVisited"));
   const ntp_tiles::NTPTile& tile = _mostVisitedData[visitedIndex];
   ntp_tiles::metrics::RecordTileClick(visitedIndex, tile.source, tileType);
 }
 
-- (void)onMostVisitedURLsAvailable:(const ntp_tiles::NTPTilesVector&)data {
-  _mostVisitedData = data;
-  [self reloadData];
-
-  if (data.size() && !_recordedPageImpression) {
-    _recordedPageImpression = YES;
-    std::vector<ntp_tiles::metrics::TileImpression> tiles;
-    for (const ntp_tiles::NTPTile& ntpTile : data) {
-      tiles.emplace_back(ntpTile.source, ntp_tiles::metrics::UNKNOWN_TILE_TYPE,
-                         ntpTile.url);
-    }
-    ntp_tiles::metrics::RecordPageImpression(
-        tiles, GetApplicationContext()->GetRapporServiceImpl());
-  }
-}
-
-- (void)onIconMadeAvailable:(const GURL&)siteUrl {
-  for (size_t i = 0; i < [self numberOfItems]; ++i) {
-    const ntp_tiles::NTPTile& ntpTile = _mostVisitedData[i];
-    if (ntpTile.url == siteUrl) {
-      NSIndexPath* indexPath =
-          [NSIndexPath indexPathForRow:i inSection:SectionWithMostVisited];
-      [_mostVisitedView reloadItemsAtIndexPaths:@[ indexPath ]];
-      break;
-    }
-  }
-}
-
 - (void)reloadData {
   // -reloadData updates from |_mostVisitedData|.
   // -invalidateLayout is necessary because sometimes the flowLayout has the
   // wrong cached size and will throw an internal exception if the
   // -numberOfItems shrinks. -setNeedsLayout is needed in case
   // -numberOfItems increases enough to add a new row and change the height
   // of _mostVisitedView.
   [_mostVisitedView reloadData];
   [[_mostVisitedView collectionViewLayout] invalidateLayout];
   [self.view setNeedsLayout];
@@ skipping 17 matching lines @@
                             ? kTopSpacingMaterialPortrait
                             : kTopSpacingMaterialLandscape;
       }
     } else {
       headerHeight = kNonGoogleSearchHeaderHeightIPad;
     }
   }
   return headerHeight;
 }
 
+#pragma mark - MostVisitedSitesObserver
+
+- (void)onMostVisitedURLsAvailable:(const ntp_tiles::NTPTilesVector&)data {
+  _mostVisitedData = data;
+  [self reloadData];
+
+  if (data.size() && !_recordedPageImpression) {
+    _recordedPageImpression = YES;
+    std::vector<ntp_tiles::metrics::TileImpression> tiles;
+    for (const ntp_tiles::NTPTile& ntpTile : data) {
+      tiles.emplace_back(ntpTile.source, ntp_tiles::metrics::UNKNOWN_TILE_TYPE,
+                         ntpTile.url);
+    }
+    ntp_tiles::metrics::RecordPageImpression(
+        tiles, GetApplicationContext()->GetRapporServiceImpl());
+  }
+}
+
+- (void)onIconMadeAvailable:(const GURL&)siteUrl {
+  for (size_t i = 0; i < [self numberOfItems]; ++i) {
+    const ntp_tiles::NTPTile& ntpTile = _mostVisitedData[i];
+    if (ntpTile.url == siteUrl) {
+      NSIndexPath* indexPath =
+          [NSIndexPath indexPathForRow:i inSection:SectionWithMostVisited];
+      [_mostVisitedView reloadItemsAtIndexPaths:@[ indexPath ]];
+      break;
+    }
+  }
+}
+
 #pragma mark - UICollectionView Methods.
 
 - (CGSize)collectionView:(UICollectionView*)collectionView
                              layout:
                                  (UICollectionViewLayout*)collectionViewLayout
     referenceSizeForHeaderInSection:(NSInteger)section {
   CGFloat headerHeight = 0;
   if (section == SectionWithOmnibox) {
     headerHeight = [self heightForSectionWithOmnibox];
     ((UICollectionViewFlowLayout*)collectionViewLayout).headerReferenceSize =
@@ skipping 564 matching lines @@
   if (!view) {
     return nil;
   }
   if ([view isKindOfClass:aClass]) {
     return view;
   }
   return [self nearestAncestorOfView:[view superview] withClass:aClass];
 }
 
 @end