Index: ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm |
diff --git a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm |
index 38569532e66eeceec57bbc03a701be228cd8c3af..f8f47ec7b33e42712ffd8008487b9d917478c875 100644 |
--- a/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm |
+++ b/ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.mm |
@@ -4,15 +4,18 @@ |
#include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_client.h" |
+#include "base/bind.h" |
+#include "base/callback.h" |
#include "components/sessions/ios/ios_live_tab.h" |
+#include "ios/chrome/browser/application_context.h" |
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
+#include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" |
#include "ios/chrome/browser/chrome_url_constants.h" |
#include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h" |
#include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_factory.h" |
-#include "ios/chrome/browser/tabs/tab.h" |
-#include "ios/chrome/browser/tabs/tab_model.h" |
-#include "ios/chrome/browser/ui/browser_ios.h" |
-#include "ios/chrome/browser/ui/browser_list_ios.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/public/provider/chrome/browser/chrome_browser_provider.h" |
#include "ios/web/public/web_thread.h" |
#include "url/gurl.h" |
@@ -21,6 +24,45 @@ |
#error "This file requires ARC support." |
#endif |
+namespace { |
+sessions::LiveTabContext* FindLiveTabContextWithCondition( |
+ const base::Callback<bool(TabModel*)>& condition) { |
+ std::vector<ios::ChromeBrowserState*> browser_states = |
+ GetApplicationContext() |
+ ->GetChromeBrowserStateManager() |
+ ->GetLoadedBrowserStates(); |
+ |
+ for (ios::ChromeBrowserState* browser_state : browser_states) { |
+ DCHECK(!browser_state->IsOffTheRecord()); |
+ NSArray<TabModel*>* tab_models; |
+ |
+ tab_models = GetTabModelsForChromeBrowserState(browser_state); |
+ for (TabModel* tab_model : tab_models) { |
+ if (condition.Run(tab_model)) { |
+ return TabRestoreServiceDelegateImplIOSFactory::GetForBrowserState( |
+ browser_state); |
+ } |
+ } |
+ |
+ if (!browser_state->HasOffTheRecordChromeBrowserState()) |
+ continue; |
+ |
+ ios::ChromeBrowserState* otr_browser_state = |
+ browser_state->GetOffTheRecordChromeBrowserState(); |
+ |
+ tab_models = GetTabModelsForChromeBrowserState(otr_browser_state); |
+ for (TabModel* tab_model : tab_models) { |
+ if (condition.Run(tab_model)) { |
+ return TabRestoreServiceDelegateImplIOSFactory::GetForBrowserState( |
+ browser_state); |
+ } |
+ } |
+ } |
+ |
+ return nullptr; |
+} |
+} // namespace |
+ |
IOSChromeTabRestoreServiceClient::IOSChromeTabRestoreServiceClient( |
ios::ChromeBrowserState* browser_state) |
: browser_state_(browser_state) {} |
@@ -39,32 +81,27 @@ IOSChromeTabRestoreServiceClient::FindLiveTabContextForTab( |
const sessions::LiveTab* tab) { |
const sessions::IOSLiveTab* requested_tab = |
static_cast<const sessions::IOSLiveTab*>(tab); |
- for (BrowserListIOS::const_iterator iter = BrowserListIOS::begin(); |
- iter != BrowserListIOS::end(); ++iter) { |
- id<BrowserIOS> browser = *iter; |
- for (Tab* current_tab in [browser tabModel]) { |
- if (current_tab.webState && |
- current_tab.webState == requested_tab->web_state()) { |
- return TabRestoreServiceDelegateImplIOSFactory::GetForBrowserState( |
- [browser browserState]); |
- } |
- } |
- } |
- return nullptr; |
+ |
+ return FindLiveTabContextWithCondition(base::Bind( |
+ [](const web::WebState* web_state, TabModel* tab_model) { |
+ for (Tab* current_tab in tab_model) { |
+ if (current_tab.webState && current_tab.webState == web_state) { |
+ return true; |
+ } |
+ } |
+ return false; |
+ }, |
+ requested_tab->web_state())); |
} |
sessions::LiveTabContext* |
IOSChromeTabRestoreServiceClient::FindLiveTabContextWithID( |
SessionID::id_type desired_id) { |
- for (BrowserListIOS::const_iterator iter = BrowserListIOS::begin(); |
- iter != BrowserListIOS::end(); ++iter) { |
- id<BrowserIOS> browser = *iter; |
- if ([browser tabModel].sessionID.id() == desired_id) { |
- return TabRestoreServiceDelegateImplIOSFactory::GetForBrowserState( |
- [browser browserState]); |
- } |
- } |
- return nullptr; |
+ return FindLiveTabContextWithCondition(base::Bind( |
+ [](SessionID::id_type desired_id, TabModel* tab_model) { |
+ return tab_model.sessionID.id() == desired_id; |
+ }, |
+ desired_id)); |
} |
bool IOSChromeTabRestoreServiceClient::ShouldTrackURLForRestore( |