Convert bookmarks NTP panel to UIViewController.

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"
@@ skipping 108 matching lines @@
 // 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.
-@property(nonatomic, strong) ContentView* contentView;
+@property(nonatomic, readwrite, strong) ContentView* view;
+
 // The possible views that can be shown from the menu.
 @property(nonatomic, strong) BookmarkFolderCollectionView* 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
@@ skipping 125 matching lines @@
 // Called when the back button is pressed on the navigation bar.
 - (void)navigationBarBack:(id)sender;
 
 // TODO(crbug.com/450646): This should not be needed but require refactoring of
 // the BookmarkCollectionViewDelegate.
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell;
 
 @end
 
 @implementation BookmarkHomeTabletNTPController
+
+@dynamic view;
 @synthesize editing = _editing;
 @synthesize editIndexPaths = _editIndexPaths;
 @synthesize bookmarks = _bookmarks;
 
-@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 panelView = _panelView;
 
@@ skipping 22 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 {
-  _contentView.delegate = nil;
+  self.view.delegate = nil;
 
   _folderView.delegate = nil;
 
   _menuView.delegate = nil;
 
   _editViewController.delegate = nil;
   _folderSelector.delegate = nil;
 }
 
 - (ios::ChromeBrowserState*)browserState {
@@ skipping 15 matching lines @@
     [self updatePrimaryMenuItem:item animated:NO];
   }
 
   [self moveMenuAndPrimaryViewToAdequateParent];
   CGFloat leadingMargin = [self primaryViewLeadingMargin];
 
   // Prevent the panelView from hijacking the gestures so that the
   // NTPController's scrollview can still scroll with the gestures.
   [self.panelView enableSideSwiping:NO];
 
-  CGFloat width = self.contentView.bounds.size.width;
+  CGFloat width = self.view.bounds.size.width;
   LayoutRect navBarLayout =
       LayoutRectMake(leadingMargin, width, 0, width - leadingMargin,
                      CGRectGetHeight([self navigationBarFrame]));
   self.navigationBar.frame = LayoutRectGetRect(navBarLayout);
   [self.editingBar setFrame:[self editingBarFrame]];
 
   UIInterfaceOrientation orient = GetInterfaceOrientation();
   [self refreshFrameOfPrimaryView];
   [[self primaryView] changeOrientation:orient];
   [self updateNavigationBarWithDuration:0 orientation:orient];
@@ skipping 61 matching lines @@
   [_loader loadURL:url
                referrer:web::Referrer()
              transition:ui::PAGE_TRANSITION_AUTO_BOOKMARK
       rendererInitiated:NO];
 }
 
 #pragma mark - Views
 
 - (void)loadWaitingView {
   DCHECK(!self.waitForModelView);
-  DCHECK(self.contentView);
+  DCHECK(self.view);
 
   // Present a waiting view.
   BookmarkHomeWaitingView* waitingView =
       [[BookmarkHomeWaitingView alloc] initWithFrame:self.view.bounds];
   self.waitForModelView = waitingView;
   [self.view addSubview:self.waitForModelView];
   [self.waitForModelView startWaiting];
 }
 
 - (void)updateMenuViewLayout {
@@ skipping 56 matching lines @@
   self.folderView.autoresizingMask =
       UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
 }
 
 - (void)updatePrimaryMenuItem:(BookmarkMenuItem*)menuItem
                      animated:(BOOL)animated {
   DCHECK(menuItem.type == bookmarks::MenuItemFolder);
   if ([self.primaryMenuItem isEqual:menuItem])
     return;
 
-  if (![self.contentView superview])
+  if (![self.view superview])
     return;
 
   [[self primaryView] removeFromSuperview];
   self.primaryMenuItem = menuItem;
 
   [self ensureFolderViewExists];
   [self.folderView resetFolder:self.primaryMenuItem.folder];
   [self.folderView promoStateChangedAnimated:NO];
 
   [[self primaryView] changeOrientation:GetInterfaceOrientation()];
   [[self primaryView] setScrollsToTop:self.scrollToTop];
 
   [self moveMenuAndPrimaryViewToAdequateParent];
 
-  // [self.contentView sendSubviewToBack:primaryView];
+  // [self.view sendSubviewToBack:primaryView];
   [self refreshFrameOfPrimaryView];
 
   self.navigationBar.hidden = NO;
   [self updateNavigationBarAnimated:animated
                         orientation:GetInterfaceOrientation()];
 
   [self.menuView updatePrimaryMenuItem:self.primaryMenuItem];
   [self updateEditBarShadow];
 }
 
@@ skipping 28 matching lines @@
     [primaryView removeFromSuperview];
 
   if ([self shouldPresentMenuInSlideInPanel]) {
     // Create (if needed), and add the panelView to the view hierarchy.
     if (!self.panelView) {
       self.panelView =
           [[BookmarkPanelView alloc] initWithFrame:CGRectZero
                                      menuViewWidth:[self menuWidth]];
     }
     [self.view addSubview:self.panelView];
-    CGSize size = self.contentView.bounds.size;
+    CGSize size = self.view.bounds.size;
     CGFloat navBarHeight = CGRectGetHeight([self navigationBarFrame]);
     LayoutRect panelLayout = LayoutRectMake(
         0, size.width, navBarHeight, size.width, size.height - navBarHeight);
 
     // Initialize the panelView with the menuView and the primaryView.
     [self.panelView setFrame:LayoutRectGetRect(panelLayout)];
     [self.panelView.menuView addSubview:self.menuView];
     self.menuView.frame = self.panelView.menuView.bounds;
     [self.panelView.contentView addSubview:primaryView];
   } else {
@@ skipping 572 matching lines @@
   [self cachePosition];
 }
 
 - (void)dismissModals {
   [self.actionSheetCoordinator stop];
   self.actionSheetCoordinator = nil;
   [self.editViewController dismiss];
 }
 
 - (void)dismissKeyboard {
-  // Uses self.contentView directly instead of going throught self.view to
+  // Uses self.view directly instead of going throught self.view to
   // avoid creating the view hierarchy unnecessarily.
-  [self.contentView endEditing:YES];
+  [self.view endEditing:YES];
 }
 
 - (void)setScrollsToTop:(BOOL)enabled {
   self.scrollToTop = enabled;
   [[self primaryView] setScrollsToTop:self.scrollToTop];
 }
 
-- (UIView*)view {
-  if (!self.contentView) {
-    _contentView = [[ContentView alloc] initWithFrame:CGRectZero];
-    _contentView.delegate = self;
-    self.contentView.backgroundColor =
-        bookmark_utils_ios::mainBackgroundColor();
-    BookmarkNavigationBar* bar =
-        [[BookmarkNavigationBar alloc] initWithFrame:CGRectZero];
-    self.navigationBar = bar;
-    self.navigationBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+- (void)loadView {
+  self.view = [[ContentView alloc] initWithFrame:CGRectZero];

[rohitrao (ping after 24h), 2017/04/17 16:11:30]

I believe that everything except for this line should go into viewDidLoad.

[justincohen, 2017/04/17 16:19:06]

Done.

+  self.view.delegate = self;
+  self.view.backgroundColor = bookmark_utils_ios::mainBackgroundColor();
+  BookmarkNavigationBar* bar =
+      [[BookmarkNavigationBar alloc] initWithFrame:CGRectZero];
+  self.navigationBar = bar;
+  self.navigationBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 
-    [self.navigationBar setEditTarget:self
-                               action:@selector(navigationBarWantsEditing:)];
-    [self.navigationBar setBackTarget:self
-                               action:@selector(navigationBarBack:)];
+  [self.navigationBar setEditTarget:self
+                             action:@selector(navigationBarWantsEditing:)];
+  [self.navigationBar setBackTarget:self action:@selector(navigationBarBack:)];
 
-    [self.navigationBar setMenuTarget:self
-                               action:@selector(toggleMenuAnimated)];
+  [self.navigationBar setMenuTarget:self action:@selector(toggleMenuAnimated)];
 
-    [self.view addSubview:self.navigationBar];
+  [self.view addSubview:self.navigationBar];
 
-    if (self.bookmarks->loaded())
-      [self loadBookmarkViews];
-    else
-      [self loadWaitingView];
-  }
-  return self.contentView;
+  if (self.bookmarks->loaded())
+    [self loadBookmarkViews];
+  else
+    [self loadWaitingView];
 }
 
 - (CGFloat)alphaForBottomShadow {
   return 0;
 }
 
 #pragma mark - BookmarkModelBridgeObserver
 
 - (void)bookmarkModelLoaded {
-  if (!self.contentView)
+  if (!self.view)
     return;
 
   DCHECK(self.waitForModelView);
   __weak BookmarkHomeTabletNTPController* weakSelf = self;
   [self.waitForModelView stopWaitingWithCompletion:^{
     BookmarkHomeTabletNTPController* strongSelf = weakSelf;
     // Early return if the controller has been deallocated.
     if (!strongSelf)
       return;
     [UIView animateWithDuration:0.2
@@ skipping 46 matching lines @@
 }
 
 - (NSIndexPath*)indexPathForCell:(UICollectionViewCell*)cell {
   DCHECK([self primaryView].collectionView);
   NSIndexPath* indexPath =
       [[self primaryView].collectionView indexPathForCell:cell];
   return indexPath;
 }
 
 @end