Removes unnecessary subclassing of BookmarkCollectionView.

ios/chrome/browser/ui/bookmarks/bookmark_home_handset_view_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_handset_view_controller.h"
 
 #include <memory>
 
 #include "base/logging.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/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_cells.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_position_cache.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_promo_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using bookmarks::BookmarkNode;
 
 namespace {
 const CGFloat kBookmarkMenuWidth = 264;
 }  // namespace
 
 @interface BookmarkHomeHandsetViewController ()<
+    BookmarkCollectionViewDelegate,
     BookmarkEditViewControllerDelegate,
-    BookmarkFolderCollectionViewDelegate,
     BookmarkFolderEditorViewControllerDelegate,
     BookmarkFolderViewControllerDelegate,
     BookmarkMenuViewDelegate,
     BookmarkModelBridgeObserver,
     BookmarkPanelViewDelegate,
     BookmarkPromoControllerDelegate> {
   // Bridge to register for bookmark changes.
   std::unique_ptr<bookmarks::BookmarkModelBridge> _bridge;
 }
 
+// This views holds the primary content of this view controller.
 // Redefined to be readwrite.
 @property(nonatomic, strong, readwrite) NSMutableArray* editIndexPaths;
 
 // Returns the parent, if all the bookmarks are siblings.
 // Otherwise returns the mobile_node.
 + (const BookmarkNode*)
 defaultMoveFolderFromBookmarks:(const std::set<const BookmarkNode*>&)bookmarks
                          model:(bookmarks::BookmarkModel*)model;
 
-// This views holds the primary content of this view controller. At any point in
-// time, it contains exactly one of the BookmarkCollectionView subclasses.
+// This views holds the primary content of this view controller.
 @property(nonatomic, strong) UIView* contentView;
 // 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 determine which collection view is
 // visible. Not by accident, this property also reflects the selected menu item
 // in the BookmarkMenuView.
@@ skipping 121 matching lines @@
 // |duration|.
 - (void)updateUIForInterfaceOrientation:(UIInterfaceOrientation)orientation
                                duration:(NSTimeInterval)duration;
 // Shows or hides the menu.
 - (void)showMenuAnimated:(BOOL)animated;
 - (void)hideMenuAnimated:(BOOL)animated updateNavigationBar:(BOOL)update;
 
 // Saves the current position and asks the delegate to open the url.
 - (void)delegateDismiss:(const GURL&)url;
 
-// TODO(crbug.com/450646): This should not be needed but require refactoring of
-// the BookmarkCollectionViewDelegate.
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell;
 
 @end
 
 @implementation BookmarkHomeHandsetViewController
 @synthesize contentView = _contentView;
 @synthesize folderView = _folderView;
 @synthesize waitForModelView = _waitForModelView;
 
 @synthesize menuView = _menuView;
@@ skipping 206 matching lines @@
       // out.
       self.cachedContentPosition = [NSNumber numberWithFloat:position];
     }
   }
 }
 
 - (void)ensureFolderViewExists {
   if (self.folderView)
     return;
 
-  BookmarkFolderCollectionView* view = [[BookmarkFolderCollectionView alloc]
+  BookmarkCollectionView* view = [[BookmarkCollectionView alloc]
       initWithBrowserState:self.browserState
                      frame:[self frameForPrimaryView]];
   self.folderView = view;
   self.folderView.delegate = self;
   [self.folderView setEditing:self.editing animated:NO];
   self.folderView.autoresizingMask =
       UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 }
 
 - (void)updatePrimaryMenuItem:(BookmarkMenuItem*)menuItem
@@ skipping 348 matching lines @@
   [navController setModalPresentationStyle:UIModalPresentationFormSheet];
   [self presentViewController:navController 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 392 matching lines @@
 
 - (const std::set<const BookmarkNode*>&)editNodes {
   return _editNodes;
 }
 
 - (void)setEditNodes:(const std::set<const BookmarkNode*>&)editNodes {
   _editNodes = editNodes;
 }
 
 @end