ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm - Issue 2628273004: Revert of Use ChromeBrowserStateManager instead of BrowserListIOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

Issue 2628273004: Revert of Use ChromeBrowserStateManager instead of BrowserListIOS. (Closed)

Patch Set: Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm ('k') | ios/chrome/browser/sync/ios_chrome_sync_client.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

diff --git a/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm b/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

index ce782676dc0a5ff79865caa7c11e76cd7efb174b..160bdd4f94db96420159d720284af5e3e49d9dee 100644

--- a/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

+++ b/ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.mm

@@ -14,7 +14,8 @@

#include "ios/chrome/browser/browser_state/chrome_browser_state.h"

#import "ios/chrome/browser/tabs/tab.h"

#import "ios/chrome/browser/tabs/tab_model.h"

-#import "ios/chrome/browser/tabs/tab_model_list.h"

+#include "ios/chrome/browser/ui/browser_ios.h"

+#include "ios/chrome/browser/ui/browser_list_ios.h"

#import "ios/web/navigation/navigation_manager_impl.h"

#include "ios/web/public/navigation_item.h"

#import "ios/web/web_state/web_state_impl.h"

@@ -29,7 +30,9 @@

TabRestoreServiceDelegateImplIOS::~TabRestoreServiceDelegateImplIOS() {}

TabModel* TabRestoreServiceDelegateImplIOS::tab_model() const {

- return GetLastActiveTabModelForChromeBrowserState(browser_state_);

+ id<BrowserIOS> browser =

+ BrowserListIOS::GetLastActiveWithBrowserState(browser_state_);

+ return [browser tabModel];

}

void TabRestoreServiceDelegateImplIOS::ShowBrowserWindow() {