Index: ios/chrome/browser/ui/browser_view_controller.mm |
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm |
index c3fda741f8dd394d6275c8392c8b7f1173f8d2f6..d5f6632bb208936549659b3026f7ba8836b7115a 100644 |
--- a/ios/chrome/browser/ui/browser_view_controller.mm |
+++ b/ios/chrome/browser/ui/browser_view_controller.mm |
@@ -88,7 +88,6 @@ |
#import "ios/chrome/browser/ui/background_generator.h" |
#import "ios/chrome/browser/ui/bookmarks/bookmark_interaction_controller.h" |
#import "ios/chrome/browser/ui/browser_container_view.h" |
-#import "ios/chrome/browser/ui/browser_list_ios.h" |
#import "ios/chrome/browser/ui/browser_view_controller_dependency_factory.h" |
#import "ios/chrome/browser/ui/chrome_web_view_factory.h" |
#import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h" |
@@ -917,7 +916,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver { |
// TODO(leng): Delay this. |
[[UpgradeCenter sharedInstance] registerClient:self]; |
_inNewTabAnimation = NO; |
- BrowserListIOS::AddBrowser(self); |
if (model && browserState) |
[self updateWithTabModel:model browserState:browserState]; |
if ([[NSUserDefaults standardUserDefaults] |
@@ -943,7 +941,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver { |
_tabStripController.reset(); |
_infoBarContainer.reset(); |
_readingListMenuNotifier.reset(); |
- BrowserListIOS::RemoveBrowser(self); |
_bookmarkModel->RemoveObserver(_bookmarkModelBridge.get()); |
[_model removeObserver:self]; |
[[UpgradeCenter sharedInstance] unregisterClient:self]; |
@@ -1044,6 +1041,14 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver { |
return _voiceSearchController && _voiceSearchController->IsPlayingAudio(); |
} |
+- (ios::ChromeBrowserState*)browserState { |
+ return _browserState; |
+} |
+ |
+- (TabModel*)tabModel { |
+ return _model.get(); |
+} |
+ |
- (SideSwipeController*)sideSwipeController { |
if (!_sideSwipeController) { |
_sideSwipeController.reset([[SideSwipeController alloc] |
@@ -1672,7 +1677,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver { |
[_contextualSearchMask removeFromSuperview]; |
[_paymentRequestManager close]; |
_paymentRequestManager.reset(); |
- BrowserListIOS::RemoveBrowser(self); |
[_toolbarController browserStateDestroyed]; |
[_model browserStateDestroyed]; |
[_preloadController browserStateDestroyed]; |
@@ -3239,16 +3243,6 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver { |
} |
} |
-#pragma mark - BrowserIOS methods |
- |
-- (ios::ChromeBrowserState*)browserState { |
- return _browserState; |
-} |
- |
-- (TabModel*)tabModel { |
- return _model.get(); |
-} |
- |
#pragma mark - No-tabs UI methods |
// Show the No-Tabs UI (hiding normal tab/web ui). |