Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm

Issue 2615003002: Use ChromeBrowserStateManager instead of BrowserListIOS. (Closed)
Patch Set: Fix ios_chrome_perftests. 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
Index: ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
diff --git a/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm b/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
index 5362854bf7bf0c993d42a41b8e4b94928d4ad75a..df84d972776e0b59da8a02a901940af915744cc9 100644
--- a/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
+++ b/ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.mm
@@ -4,14 +4,15 @@
#include "ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.h"
+#include "base/logging.h"
+#include "ios/chrome/browser/application_context.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#include "ios/chrome/browser/tabs/tab_model.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h"
+#import "ios/chrome/browser/tabs/tab_model.h"
+#import "ios/chrome/browser/tabs/tab_model_list.h"
#import "ios/chrome/browser/tabs/tab_model_synced_window_delegate.h"
-#import "ios/chrome/browser/ui/browser_list_ios.h"
-TabModelSyncedWindowDelegatesGetter::TabModelSyncedWindowDelegatesGetter(
- ios::ChromeBrowserState* browser_state)
- : browser_state_(browser_state) {}
+TabModelSyncedWindowDelegatesGetter::TabModelSyncedWindowDelegatesGetter() {}
TabModelSyncedWindowDelegatesGetter::~TabModelSyncedWindowDelegatesGetter() {}
@@ -19,18 +20,20 @@ std::set<const sync_sessions::SyncedWindowDelegate*>
TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
std::set<const sync_sessions::SyncedWindowDelegate*> synced_window_delegates;
- for (BrowserListIOS::const_iterator iter = BrowserListIOS::begin();
- iter != BrowserListIOS::end(); ++iter) {
- id<BrowserIOS> browser = *iter;
- TabModel* tabModel = [browser tabModel];
- // TODO(crbug.com/548612): BrowserState may be unnecessary as iOS does not
- // support multiple profiles starting with M47. There should still be a way
- // to filter out Incognito delegates, though.
- if (tabModel.browserState != browser_state_)
- continue;
- // Do not return windows without any tabs, to match desktop.
- if ([tabModel currentTab])
- synced_window_delegates.insert([tabModel syncedWindowDelegate]);
+ std::vector<ios::ChromeBrowserState*> browser_states =
+ GetApplicationContext()
+ ->GetChromeBrowserStateManager()
+ ->GetLoadedBrowserStates();
+
+ for (auto* browser_state : browser_states) {
+ DCHECK(!browser_state->IsOffTheRecord());
+ NSArray<TabModel*>* tabModels =
+ GetTabModelsForChromeBrowserState(browser_state);
+ for (TabModel* tabModel in tabModels) {
+ if (tabModel.currentTab) {
+ synced_window_delegates.insert([tabModel syncedWindowDelegate]);
+ }
+ }
}
return synced_window_delegates;
@@ -38,8 +41,7 @@ TabModelSyncedWindowDelegatesGetter::GetSyncedWindowDelegates() {
const sync_sessions::SyncedWindowDelegate*
TabModelSyncedWindowDelegatesGetter::FindById(SessionID::id_type session_id) {
- for (const sync_sessions::SyncedWindowDelegate* delegate :
- GetSyncedWindowDelegates()) {
+ for (const auto* delegate : GetSyncedWindowDelegates()) {
if (session_id == delegate->GetSessionId())
return delegate;
}
« no previous file with comments | « ios/chrome/browser/tabs/tab_model_synced_window_delegate_getter.h ('k') | ios/chrome/browser/tabs/tab_model_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698