Removes unnecessary subclassing of BookmarkCollectionView.

ios/chrome/browser/ui/bookmarks/bookmark_home_tablet_ntp_controller.mm

 // Copyright 2014 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/bookmarks/bookmark_home_tablet_ntp_controller.h"
 
 #include <memory>
 
 #include "base/ios/block_types.h"
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/strings/grit/components_strings.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/bookmarks/bookmarks_utils.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/metrics/new_tab_page_uma.h"
 #import "ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h"
 #import "ios/chrome/browser/ui/bookmarks/bars/bookmark_editing_bar.h"
 #import "ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.h"
+#import "ios/chrome/browser/ui/bookmarks/bookmark_collection_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h"
-#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_home_primary_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_home_waiting_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_menu_item.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_menu_view.h"
 #include "ios/chrome/browser/ui/bookmarks/bookmark_model_bridge_observer.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_panel_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h"
@@ skipping 32 matching lines @@
 @implementation ContentView
 @synthesize delegate = _delegate;
 
 - (void)layoutSubviews {
   [self.delegate willLayoutSubviews];
   [super layoutSubviews];
 }
 @end
 
 @interface BookmarkHomeTabletNTPController ()<
+    BookmarkCollectionViewDelegate,
     BookmarkEditViewControllerDelegate,
-    BookmarkFolderCollectionViewDelegate,
     BookmarkFolderEditorViewControllerDelegate,
     BookmarkFolderViewControllerDelegate,
     BookmarkMenuViewDelegate,
     BookmarkModelBridgeObserver,
     BookmarkPromoControllerDelegate,
     ContentViewDelegate> {
   // Bridge to register for bookmark changes.
   std::unique_ptr<bookmarks::BookmarkModelBridge> _bridge;
   ios::ChromeBrowserState* _browserState;  // Weak.
   __weak id<UrlLoader> _loader;
@@ skipping 27 matching lines @@
 - (void)insertEditNode:(const BookmarkNode*)node
            atIndexPath:(NSIndexPath*)indexPath;
 // Removes |node| corresponding to a |cell| if it's present.
 - (void)removeEditNode:(const BookmarkNode*)node
            atIndexPath:(NSIndexPath*)indexPath;
 // This method updates the property, and resets the edit nodes.
 - (void)setEditing:(BOOL)editing animated:(BOOL)animated;
 
 #pragma mark - Properties and methods akin to BookmarkHomeHandsetViewController
 
-// This views holds the primary content of this controller. At any point in
-// time, it contains exactly one of the BookmarkCollectionView subclasses.
+// This views holds the primary content of this controller.
 @property(nonatomic, readwrite, strong) ContentView* view;
 
 // The possible views that can be shown from the menu.
-@property(nonatomic, strong) BookmarkFolderCollectionView* folderView;
+@property(nonatomic, strong) BookmarkCollectionView* folderView;
 // This view is created and used if the model is not fully loaded yet by the
 // time this controller starts.
 @property(nonatomic, strong) BookmarkHomeWaitingView* waitForModelView;
 
 // The menu with all the folders and special entries.
 @property(nonatomic, strong) BookmarkMenuView* menuView;
 // At any point in time, there is exactly one collection view whose view is part
 // of the view hierarchy. This property determines which collection view is
 // visible. Not by accident, this property also reflects the selected menu item
 // in the BookmarkMenuView.
@@ skipping 350 matching lines @@
       // out.
       self.cachedContentPosition = [NSNumber numberWithFloat:position];
     }
   }
 }
 
 - (void)ensureFolderViewExists {
   if (self.folderView)
     return;
 
-  BookmarkFolderCollectionView* view = [[BookmarkFolderCollectionView alloc]
-      initWithBrowserState:self.browserState
-                     frame:CGRectZero];
+  BookmarkCollectionView* view =
+      [[BookmarkCollectionView alloc] initWithBrowserState:self.browserState
+                                                     frame:CGRectZero];
   self.folderView = view;
   self.folderView.delegate = self;
   [self.folderView setEditing:self.editing animated:NO];
   self.folderView.autoresizingMask =
       UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 }
 
 - (void)updatePrimaryMenuItem:(BookmarkMenuItem*)menuItem
                      animated:(BOOL)animated {
   DCHECK(menuItem.type == bookmarks::MenuItemFolder);
@@ skipping 439 matching lines @@
                                                     animated:YES
                                                   completion:NULL];
 }
 
 - (void)deleteNodes:(const std::set<const BookmarkNode*>&)nodes {
   DCHECK_GE(nodes.size(), 1u);
   bookmark_utils_ios::DeleteBookmarksWithUndoToast(nodes, self.bookmarks,
                                                    self.browserState);
 }
 
-#pragma mark - BookmarkFolderCollectionViewDelegate
+#pragma mark - BookmarkCollectionViewDelegate
 
-- (void)bookmarkFolderCollectionView:(BookmarkFolderCollectionView*)view
-         selectedFolderForNavigation:(const BookmarkNode*)folder {
+- (void)bookmarkCollectionView:(BookmarkCollectionView*)view
+    selectedFolderForNavigation:(const BookmarkNode*)folder {
   BookmarkMenuItem* menuItem = nil;
   if (view == self.folderView) {
     const BookmarkNode* parent = RootLevelFolderForNode(folder, self.bookmarks);
     menuItem =
         [BookmarkMenuItem folderMenuItemForNode:folder rootAncestor:parent];
   } else {
     NOTREACHED();
     return;
   }
   [self updatePrimaryMenuItem:menuItem animated:YES];
@@ skipping 298 matching lines @@
 }
 
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell {
   DCHECK([self primaryView].collectionView);
   NSIndexPath* indexPath =
       [[self primaryView].collectionView indexPathForCell:cell];
   return indexPath;
 }
 
 @end