Convert bookmarks NTP panel to UIViewController.

ios/chrome/browser/ui/ntp/new_tab_page_controller.mm

 // Copyright 2012 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/ntp/new_tab_page_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #include "base/mac/objc_property_releaser.h"
 #include "base/metrics/user_metrics.h"
 #include "base/metrics/user_metrics_action.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/sync_sessions/synced_session.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #include "ios/chrome/browser/sync/sync_setup_service.h"
 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_controller_factory.h"
+#import "ios/chrome/browser/ui/bookmarks/bookmark_home_tablet_ntp_controller.h"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/ntp/google_landing_controller.h"
 #import "ios/chrome/browser/ui/ntp/incognito_panel_controller.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_bar_item.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_view.h"
 #import "ios/chrome/browser/ui/ntp/recent_tabs/recent_tabs_panel_controller.h"
 #import "ios/chrome/browser/ui/rtl_geometry.h"
 #include "ios/chrome/browser/ui/toolbar/toolbar_model_ios.h"
@@ skipping 242 matching lines @@
 
 - (void)dealloc {
   // Animations can last past the life of the NTP controller, nil out the
   // delegate.
   self.ntpView.scrollView.delegate = nil;
 
   // This is not an ideal place to put view controller contaimnent, rather a
   // //web -wasDismissed method on CRWNativeContent would be more accurate. If
   // CRWNativeContent leaks, this will not be called.
   // TODO(crbug.com/708319): Also call -removeFromParentViewController for
-  // bookmarks, open tabs and incognit here.
+  // open tabs and incognito here.
   [googleLandingController_ removeFromParentViewController];
+  [bookmarkController_ removeFromParentViewController];
 
   [googleLandingController_ setDelegate:nil];
   [bookmarkController_ setDelegate:nil];
   [openTabsController_ setDelegate:nil];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 #pragma mark - CRWNativeContent
 
 - (void)willBeDismissed {
   // This methods is called by //web immediately before |self|'s view is removed
   // from the view hierarchy, making it an ideal spot to intiate view controller
   // containment methods.
   // TODO(crbug.com/708319): Also call -willMoveToParentViewController:nil for
-  // bookmarks, open tabs and incognito here.
+  // open tabs and incognito here.
   [googleLandingController_ willMoveToParentViewController:nil];
+  [bookmarkController_ willMoveToParentViewController:nil];
 }
 
 - (void)reload {
   [currentController_ reload];
   [super reload];
 }
 
 - (void)wasShown {
   [currentController_ wasShown];
   // Ensure that the NTP has the latest data when it is shown.
@@ skipping 189 matching lines @@
   // Only load the controllers once.
   if (item.identifier == NewTabPage::kBookmarksPanel) {
     if (!bookmarkController_) {
       base::scoped_nsobject<BookmarkControllerFactory> factory(
           [[BookmarkControllerFactory alloc] init]);
       bookmarkController_.reset([[factory
           bookmarkPanelControllerForBrowserState:browserState_
                                           loader:loader_
                                       colorCache:dominantColorCache_] retain]);
     }
+    panelController = bookmarkController_;
     view = [bookmarkController_ view];
-    // TODO(crbug.com/708319): Also set panelController for bookmarks here.
     [bookmarkController_ setDelegate:self];
   } else if (item.identifier == NewTabPage::kMostVisitedPanel) {
     if (!googleLandingController_) {
       googleLandingController_.reset([[GoogleLandingController alloc]
               initWithLoader:loader_
                 browserState:browserState_
                      focuser:focuser_
           webToolbarDelegate:webToolbarDelegate_
                     tabModel:tabModel_]);
     }
@@ skipping 182 matching lines @@
 
 - (void)updateNtpBarShadowForPanelController:
     (id<NewTabPagePanelProtocol>)ntpPanelController {
   if (currentController_ != ntpPanelController)
     return;
   [self.ntpView.tabBar
       setShadowAlpha:[ntpPanelController alphaForBottomShadow]];
 }
 
 @end