Creates common super class for bookmark handset and tablet view controllers

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"
@@ skipping 27 matching lines @@
 #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,
     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.
 @property(nonatomic, strong) UIView* contentView;
-// The possible views that can be shown from the menu.
-@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.
-@property(nonatomic, strong) BookmarkMenuItem* primaryMenuItem;
 // When the view is first shown on the screen, this property represents the
 // cached value of the y of the content offset of the primary view. This
 // property is set to nil after it is used.
 @property(nonatomic, strong) NSNumber* cachedContentPosition;
 
-// The navigation bar sits on top of the main content.
-@property(nonatomic, strong) BookmarkNavigationBar* navigationBar;
 // The layout code in this class relies on the assumption that the editingBar
 // has the same frame as the navigationBar.
 @property(nonatomic, strong) BookmarkEditingBar* editingBar;
 
 // The action sheet coordinator used when trying to edit a single bookmark.
 @property(nonatomic, strong) ActionSheetCoordinator* actionSheetCoordinator;
 // The view controller used to view and edit a single bookmark.
 @property(nonatomic, strong) BookmarkEditViewController* editViewController;
 // The view controller used to pick a folder in which to move the selected
 // bookmarks.
 @property(nonatomic, strong) BookmarkFolderViewController* folderSelector;
 // The view controller to present when editing the current folder.
 @property(nonatomic, strong) BookmarkFolderEditorViewController* folderEditor;
 #pragma mark Specific to this class.
 
-// The panel view slides on top of the content to display the menu.
-@property(nonatomic, strong) BookmarkPanelView* panelView;
-
-// Either the menu or the primaryView can scrollToTop.
-@property(nonatomic, assign) BOOL scrollingMenuToTop;
 // The controller managing the display of the promo cell and the promo view
 // controller.
 @property(nonatomic, strong) BookmarkPromoController* bookmarkPromoController;
 
 #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)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;
 // Shows or hides the editing bar.
@@ skipping 53 matching lines @@
 // Called when the edit button is pressed on the navigation bar.
 - (void)navigationBarWantsEditing:(id)sender;
 // Called when the cancel button is pressed on the navigation bar.
 - (void)navigationBarCancel:(id)sender;
 // Called when the menu button is pressed on the navigation bar.
 - (void)navigationBarToggledMenu:(id)sender;
 // Called when the back button is pressed on the navigation bar.
 - (void)navigationBarBack:(id)sender;
 
 #pragma mark private methods
-// The active collection view that corresponds to primaryMenuItem.
-// This must be implemented by subclass.
-- (UIView<BookmarkHomePrimaryView>*)primaryView;
 // Returns the size of the primary view.
 - (CGRect)frameForPrimaryView;
 // Updates the UI to reflect the given orientation, with an animation lasting
 // |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;
 
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell;
 
 @end
 
 @implementation BookmarkHomeHandsetViewController
 @synthesize contentView = _contentView;
-@synthesize folderView = _folderView;
-@synthesize waitForModelView = _waitForModelView;
 
-@synthesize menuView = _menuView;
-@synthesize primaryMenuItem = _primaryMenuItem;
 @synthesize cachedContentPosition = _cachedContentPosition;
-@synthesize navigationBar = _navigationBar;
 @synthesize editingBar = _editingBar;
 
 @synthesize actionSheetCoordinator = _actionSheetCoordinator;
 @synthesize editViewController = _editViewController;
 @synthesize folderSelector = _folderSelector;
 @synthesize folderEditor = _folderEditor;
 
-@synthesize panelView = _panelView;
-@synthesize scrollingMenuToTop = _scrollingMenuToTop;
 @synthesize bookmarkPromoController = _bookmarkPromoController;
 
 @synthesize delegate = _delegate;
 @synthesize editIndexPaths = _editIndexPaths;
 @synthesize editing = _editing;
-@synthesize bookmarks = _bookmarks;
-@synthesize loader = _loader;
-@synthesize browserState = _browserState;
 
 - (instancetype)initWithLoader:(id<UrlLoader>)loader
                   browserState:(ios::ChromeBrowserState*)browserState {
-  DCHECK(browserState);
-  self = [super initWithNibName:nil bundle:nil];
+  self = [super initWithLoader:loader browserState:browserState];
   if (self) {
-    _browserState = browserState->GetOriginalChromeBrowserState();
-    _loader = loader;
-
-    _bookmarks = ios::BookmarkModelFactory::GetForBrowserState(_browserState);
     _editIndexPaths = [[NSMutableArray alloc] init];
 
     [self resetEditNodes];
 
     _bridge.reset(new bookmarks::BookmarkModelBridge(self, self.bookmarks));
     // 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 {
-  _folderView.delegate = nil;
-
-  _menuView.delegate = nil;
-
   _editViewController.delegate = nil;
   _folderSelector.delegate = nil;
-
-  _panelView.delegate = nil;
-}
-
-- (void)loadView {
-  CGRect frame = [[UIScreen mainScreen] bounds];
-  self.view = [[UIView alloc] initWithFrame:frame];
 }
 
 - (void)resetEditNodes {
   _editNodes = std::set<const BookmarkNode*>();
   _editNodesOrdered = std::vector<const BookmarkNode*>();
   [self.editIndexPaths removeAllObjects];
 }
 
 - (void)insertEditNode:(const BookmarkNode*)node
            atIndexPath:(NSIndexPath*)indexPath {
@@ skipping 38 matching lines @@
     [self setEditing:NO animated:YES];
   else
     [self updateEditingStateAnimated:YES];
 }
 
 #pragma mark - UIViewController methods
 
 - (void)viewDidLoad {
   [super viewDidLoad];
 
-  BookmarkNavigationBar* bar =
-      [[BookmarkNavigationBar alloc] initWithFrame:[self navigationBarFrame]];
-  self.navigationBar = bar;
+  self.navigationBar.frame = [self navigationBarFrame];
   [self.navigationBar setEditTarget:self
                              action:@selector(navigationBarWantsEditing:)];
   [self.navigationBar setMenuTarget:self
                              action:@selector(navigationBarToggledMenu:)];
   [self.navigationBar setBackTarget:self action:@selector(navigationBarBack:)];
   [self.navigationBar setCancelTarget:self
                                action:@selector(navigationBarCancel:)];
 
   [self.view addSubview:self.navigationBar];
   [self.view bringSubviewToFront:self.navigationBar];
@@ skipping 10 matching lines @@
 
 #pragma mark - Accessibility
 
 - (BOOL)accessibilityPerformEscape {
   [self delegateDismiss:GURL()];
   return YES;
 }
 
 #pragma mark - Methods duplicated from BookmarkHomeTabletNTPController.
 
-- (void)loadWaitingView {
-  DCHECK(!self.waitForModelView);
-  DCHECK([self isViewLoaded]);
-
-  // Present a waiting view.
-  BookmarkHomeWaitingView* waitingView =
-      [[BookmarkHomeWaitingView alloc] initWithFrame:self.view.bounds];
-  self.waitForModelView = waitingView;
-  [self.view addSubview:self.waitForModelView];
-  [self.waitForModelView startWaiting];
-}
-
 - (void)loadBookmarkViews {
+  [super loadBookmarkViews];
   DCHECK(self.bookmarks->loaded());
   DCHECK([self isViewLoaded]);
 
-  self.panelView =
-      [[BookmarkPanelView alloc] initWithFrame:[self frameForPrimaryView]
-                                 menuViewWidth:kBookmarkMenuWidth];
-  self.panelView.autoresizingMask =
-      UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+  self.folderView.delegate = self;
+  [self.folderView setFrame:[self frameForPrimaryView]];
+
+  [self.panelView setFrame:[self frameForPrimaryView]];
   self.panelView.delegate = self;
   [self.view insertSubview:self.panelView atIndex:0];
 
   self.contentView = [[UIView alloc] init];
   self.contentView.frame = self.panelView.contentView.bounds;
   self.contentView.autoresizingMask =
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
   [self.panelView.contentView addSubview:self.contentView];
 
-  // The user can swipe the BookmarkPanelView to show the menuView.
-  // Therefore, it must be created here.
-  self.menuView = [[BookmarkMenuView alloc]
-      initWithBrowserState:self.browserState
-                     frame:self.panelView.menuView.bounds];
   self.menuView.delegate = self;
   [self.panelView.menuView addSubview:self.menuView];
-  self.menuView.autoresizingMask =
-      UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
   // Load the last primary menu item which the user had active.
   BookmarkMenuItem* item = nil;
   CGFloat position = 0;
   BOOL found =
       bookmark_utils_ios::GetPositionCache(self.bookmarks, &item, &position);
   if (!found)
     item = [self.menuView defaultMenuItem];
 
   [self updatePrimaryMenuItem:item animated:NO];
 
   if (found) {
     // If the view has already been laid out, then immediately apply the content
     // position.
     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)ensureFolderViewExists {
-  if (self.folderView)
-    return;
-
-  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
                      animated:(BOOL)animated {
-  DCHECK(menuItem.type == bookmarks::MenuItemFolder);
-  if ([self.primaryMenuItem isEqual:menuItem])
-    return;
+  [super updatePrimaryMenuItem:menuItem];
 
   // Disable editing on previous primary view before dismissing it. No need to
   // animate because this view is immediately removed from hierarchy.
   if ([[self primaryMenuItem] supportsEditing])
     [self.primaryView setEditing:NO animated:NO];
 
-  [[self primaryView] removeFromSuperview];
-  self.primaryMenuItem = menuItem;
-
-  [self ensureFolderViewExists];
-  [self.folderView resetFolder:self.primaryMenuItem.folder];
-  [self.folderView promoStateChangedAnimated:NO];
-
   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 {
-  if (self.primaryMenuItem.type == bookmarks::MenuItemFolder)
-    return self.folderView;
-  return nil;
 }
 
 #pragma mark - Editing bar methods.
 
 - (void)updateEditingStateAnimated:(BOOL)animated {
   if (!self.editing) {
     [self hideEditingBarAnimated:animated];
     [self updateEditBarShadow];
     [self.panelView enableSideSwiping:YES];
     return;
@@ skipping 515 matching lines @@
 
 - (void)updateUIForInterfaceOrientation:(UIInterfaceOrientation)orientation
                                duration:(NSTimeInterval)duration {
   [[self primaryView] changeOrientation:orientation];
   [self updateNavigationBarWithDuration:duration orientation:orientation];
 }
 
 - (void)showMenuAnimated:(BOOL)animated {
   [self.menuView setScrollsToTop:YES];
   [[self primaryView] setScrollsToTop:NO];
-  self.scrollingMenuToTop = YES;
+  self.scrollToTop = YES;
   [self.panelView showMenuAnimated:animated];
   [self updateNavigationBarAnimated:animated
                         orientation:GetInterfaceOrientation()];
 }
 
 - (void)hideMenuAnimated:(BOOL)animated updateNavigationBar:(BOOL)update {
   [self.menuView setScrollsToTop:NO];
   [[self primaryView] setScrollsToTop:YES];
-  self.scrollingMenuToTop = NO;
+  self.scrollToTop = NO;
   [self.panelView hideMenuAnimated:animated];
   if (update) {
     UIInterfaceOrientation orient = GetInterfaceOrientation();
     [self updateNavigationBarAnimated:animated orientation:orient];
   }
 }
 
 - (void)dismissModals:(BOOL)animated {
   [self.actionSheetCoordinator stop];
   self.actionSheetCoordinator = nil;
 }
 
 #pragma mark - BookmarkPanelViewDelegate
 
 - (void)bookmarkPanelView:(BookmarkPanelView*)view
              willShowMenu:(BOOL)showMenu
     withAnimationDuration:(CGFloat)duration {
   if (showMenu) {
     [self.menuView setScrollsToTop:YES];
     [[self primaryView] setScrollsToTop:NO];
-    self.scrollingMenuToTop = YES;
+    self.scrollToTop = YES;
   } else {
     [self.menuView setScrollsToTop:NO];
     [[self primaryView] setScrollsToTop:YES];
-    self.scrollingMenuToTop = NO;
+    self.scrollToTop = NO;
   }
 
   if ([self shouldShowEditButtonWithMenuVisibility:showMenu])
     [self.navigationBar showEditButtonWithAnimationDuration:duration];
   else
     [self.navigationBar hideEditButtonWithAnimationDuration:duration];
 }
 
 - (void)bookmarkPanelView:(BookmarkPanelView*)view
     updatedMenuVisibility:(CGFloat)visibility {
@@ skipping 150 matching lines @@
 
 - (const std::set<const BookmarkNode*>&)editNodes {
   return _editNodes;
 }
 
 - (void)setEditNodes:(const std::set<const BookmarkNode*>&)editNodes {
   _editNodes = editNodes;
 }
 
 @end