Removing "All Bookmarks"

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>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/objc_property_releaser.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/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/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_all_collection_view.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_collection_cells.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"
@@ skipping 26 matching lines @@
   // Bridge to register for bookmark changes.
   std::unique_ptr<bookmarks::BookmarkModelBridge> _bridge;
   base::mac::ObjCPropertyReleaser
       _propertyReleaser_BookmarkHomeHandsetViewController;
 }
 
 // This views holds the primary content of this view controller. At any point in
 // time, it contains exactly one of the BookmarkCollectionView subclasses.
 @property(nonatomic, retain) UIView* contentView;
 // The possible views that can be shown from the menu.
-@property(nonatomic, retain) BookmarkAllCollectionView* allItemsView;
 @property(nonatomic, retain) BookmarkFolderCollectionView* folderView;
 // This view is created and used if the model is not fully loaded yet by the
 // time this controller starts.
 @property(nonatomic, retain) BookmarkHomeWaitingView* waitForModelView;
 
 // The menu with all the folders and special entries.
 @property(nonatomic, retain) 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
@@ skipping 32 matching lines @@
 
 #pragma mark View loading and switching
 // This method is called if the view needs to be loaded and the model is not
 // ready yet.
 - (void)loadWaitingView;
 // This method should be called at most once in the life-cycle of the
 // class. It should be called at the soonest possible time after the
 // view has been loaded, and the bookmark model is loaded.
 - (void)loadBookmarkViews;
 // If the view doesn't exist, create it.
-- (void)ensureAllViewExists;
 - (void)ensureFolderViewExists;
 // Updates the property 'primaryMenuItem'.
 // Updates the UI to reflect the new state of 'primaryMenuItem'.
 - (void)updatePrimaryMenuItem:(BookmarkMenuItem*)menuItem
                      animated:(BOOL)animated;
 
 #pragma mark Editing related methods
 // This method statelessly updates the editing top bar from |_editNodes| and
 // |editing|.
 - (void)updateEditingStateAnimated:(BOOL)animated;
@@ skipping 77 matching lines @@
 // 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 allItemsView = _allItemsView;
 @synthesize contentView = _contentView;
 @synthesize folderView = _folderView;
 @synthesize waitForModelView = _waitForModelView;
 
 @synthesize menuView = _menuView;
 @synthesize primaryMenuItem = _primaryMenuItem;
 @synthesize cachedContentPosition = _cachedContentPosition;
 @synthesize navigationBar = _navigationBar;
 @synthesize editingBar = _editingBar;
 
@@ skipping 17 matching lines @@
     // It is important to initialize the promo controller with the browser state
     // passed in, as it could be incognito.
     _bookmarkPromoController =
         [[BookmarkPromoController alloc] initWithBrowserState:browserState
                                                      delegate:self];
   }
   return self;
 }
 
 - (void)dealloc {
-  _allItemsView.delegate = nil;
   _folderView.delegate = nil;
 
   _menuView.delegate = nil;
 
   _editViewController.delegate = nil;
   _folderSelector.delegate = nil;
 
   _panelView.delegate = nil;
   [super dealloc];
 }
@@ skipping 102 matching lines @@
     if (self.view.window) {
       [[self primaryView] applyContentPosition:position];
     } else {
       // Otherwise, save the position to be applied once the view has been laid
       // out.
       self.cachedContentPosition = [NSNumber numberWithFloat:position];
     }
   }
 }
 
-- (void)ensureAllViewExists {
-  if (self.allItemsView)
-    return;
-
-  base::scoped_nsobject<BookmarkAllCollectionView> view(
-      [[BookmarkAllCollectionView alloc]
-          initWithBrowserState:self.browserState
-                         frame:[self frameForPrimaryView]]);
-  self.allItemsView = view;
-  self.allItemsView.delegate = self;
-  [self.allItemsView setEditing:self.editing animated:NO];
-  self.allItemsView.autoresizingMask =
-      UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
-}
-
 - (void)ensureFolderViewExists {
   if (self.folderView)
     return;
 
   base::scoped_nsobject<BookmarkFolderCollectionView> view(
       [[BookmarkFolderCollectionView 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
                      animated:(BOOL)animated {
   if ([self.primaryMenuItem isEqual:menuItem])
     return;
 
   // Disable editing on previous primary view before dismissing it. No need to
   // animate because this view is immediately removed from hierarchy.
   [self.primaryView setEditing:NO animated:NO];
 
   [[self primaryView] removeFromSuperview];
   self.primaryMenuItem = menuItem;
 
   switch (self.primaryMenuItem.type) {
-    case bookmarks::MenuItemAll:
-      [self ensureAllViewExists];
-      break;
     case bookmarks::MenuItemFolder:
       [self ensureFolderViewExists];
       [self.folderView resetFolder:self.primaryMenuItem.folder];
       [self.folderView promoStateChangedAnimated:NO];
       break;
     case bookmarks::MenuItemDivider:
     case bookmarks::MenuItemSectionHeader:
       NOTREACHED();
       break;
   }
 
   UIView* primaryView = [self primaryView];
   [[self primaryView] changeOrientation:GetInterfaceOrientation()];
   [[self primaryView] setScrollsToTop:!self.scrollingMenuToTop];
 
   [self.contentView insertSubview:primaryView atIndex:0];
   primaryView.frame = self.contentView.bounds;
 
   [self updateNavigationBarAnimated:animated
                         orientation:GetInterfaceOrientation()];
 
   [self.menuView updatePrimaryMenuItem:self.primaryMenuItem];
 }
 
 - (UIView<BookmarkHomePrimaryView>*)primaryView {
   switch (self.primaryMenuItem.type) {
-    case bookmarks::MenuItemAll:
-      return self.allItemsView;
     case bookmarks::MenuItemFolder:
       return self.folderView;
     case bookmarks::MenuItemDivider:
     case bookmarks::MenuItemSectionHeader:
       NOTREACHED();
       return nil;
   }
 }
 
 #pragma mark - Editing bar methods.
@@ skipping 683 matching lines @@
         [[self primaryView] contentPositionInPortraitOrientation],
         [self primaryMenuItem]);
   }
   [self.delegate bookmarkHomeViewControllerWantsDismissal:self
                                           navigationToUrl:url];
 }
 
 #pragma mark - BookmarkPromoControllerDelegate
 
 - (void)promoStateChanged:(BOOL)promoEnabled {
-  [self.allItemsView.collectionView reloadData];
-  // This is required to workaround a crash seen once on iOS 7.1 when
-  // the collection gets two reloadData without getting a call to layout
-  // subviews, the collection view will reuse some cached data for the perfoming
-  // the layout which are invalid after the second call to reloadData.
-  // Forcing the layout invalidation after each reloadData seems to fix the
-  // issue.
-  [self.allItemsView.collectionView.collectionViewLayout invalidateLayout];
-
   [self.folderView
       promoStateChangedAnimated:self.folderView == [self primaryView]];
 }
 
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell {
   DCHECK([self primaryView].collectionView);
   NSIndexPath* indexPath =
       [[self primaryView].collectionView indexPathForCell:cell];
   return indexPath;
 }
 
 @end