Commit aea1645c authored by Mark Cogan's avatar Mark Cogan Committed by Commit Bot

[iOS] Remove TabModelList from AutocompleteProviderClientImpl

This straightforwardly replaces the use of TabModelList to use
BrowserList. Technically this is a functional change because it will
check if the passed URL is open in any tab in any window, but that was
presumably the desired behavior in the first place.

Bug: 1058332
Change-Id: I52075acd0b6e3fa0ccd3bad69ee810769f1031f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2087333Reviewed-by: default avatarStepan Khapugin <stkhapugin@chromium.org>
Commit-Queue: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747185}
parent 2966a3ea
...@@ -36,10 +36,10 @@ source_set("autocomplete") { ...@@ -36,10 +36,10 @@ source_set("autocomplete") {
"//ios/chrome/browser/bookmarks", "//ios/chrome/browser/bookmarks",
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
"//ios/chrome/browser/history", "//ios/chrome/browser/history",
"//ios/chrome/browser/main:public",
"//ios/chrome/browser/search_engines", "//ios/chrome/browser/search_engines",
"//ios/chrome/browser/signin", "//ios/chrome/browser/signin",
"//ios/chrome/browser/sync", "//ios/chrome/browser/sync",
"//ios/chrome/browser/tabs",
"//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list",
"//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser",
"//ios/web", "//ios/web",
......
...@@ -24,12 +24,13 @@ ...@@ -24,12 +24,13 @@
#include "ios/chrome/browser/chrome_url_constants.h" #include "ios/chrome/browser/chrome_url_constants.h"
#include "ios/chrome/browser/history/history_service_factory.h" #include "ios/chrome/browser/history/history_service_factory.h"
#include "ios/chrome/browser/history/top_sites_factory.h" #include "ios/chrome/browser/history/top_sites_factory.h"
#import "ios/chrome/browser/main/browser.h"
#import "ios/chrome/browser/main/browser_list.h"
#import "ios/chrome/browser/main/browser_list_factory.h"
#include "ios/chrome/browser/pref_names.h" #include "ios/chrome/browser/pref_names.h"
#include "ios/chrome/browser/search_engines/template_url_service_factory.h" #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
#include "ios/chrome/browser/signin/identity_manager_factory.h" #include "ios/chrome/browser/signin/identity_manager_factory.h"
#include "ios/chrome/browser/sync/profile_sync_service_factory.h" #include "ios/chrome/browser/sync/profile_sync_service_factory.h"
#import "ios/chrome/browser/tabs/tab_model.h"
#import "ios/chrome/browser/tabs/tab_model_list.h"
#import "ios/chrome/browser/web_state_list/web_state_list.h" #import "ios/chrome/browser/web_state_list/web_state_list.h"
#include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
...@@ -215,9 +216,16 @@ void AutocompleteProviderClientImpl::PrefetchImage(const GURL& url) {} ...@@ -215,9 +216,16 @@ void AutocompleteProviderClientImpl::PrefetchImage(const GURL& url) {}
bool AutocompleteProviderClientImpl::IsTabOpenWithURL( bool AutocompleteProviderClientImpl::IsTabOpenWithURL(
const GURL& url, const GURL& url,
const AutocompleteInput* input) { const AutocompleteInput* input) {
TabModel* tab_model = BrowserList* browser_list =
TabModelList::GetLastActiveTabModelForChromeBrowserState(browser_state_); BrowserListFactory::GetForBrowserState(browser_state_);
WebStateList* web_state_list = tab_model.webStateList; std::set<Browser*> browsers = browser_state_->IsOffTheRecord()
return web_state_list && web_state_list->GetIndexOfInactiveWebStateWithURL( ? browser_list->AllIncognitoBrowsers()
url) != WebStateList::kInvalidIndex; : browser_list->AllRegularBrowsers();
for (Browser* browser : browsers) {
if (browser->GetWebStateList()->GetIndexOfInactiveWebStateWithURL(url) !=
WebStateList::kInvalidIndex) {
return true;
}
}
return false;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment