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

Unified Diff: components/omnibox/browser/in_memory_url_index.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 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: components/omnibox/browser/in_memory_url_index.cc
diff --git a/components/omnibox/browser/in_memory_url_index.cc b/components/omnibox/browser/in_memory_url_index.cc
index c0273017dfd7f8d215338e43847846813c0696ea..4ff7dd56fe9f2d373bba1b0806c3485b14e04667 100644
--- a/components/omnibox/browser/in_memory_url_index.cc
+++ b/components/omnibox/browser/in_memory_url_index.cc
@@ -45,10 +45,8 @@ InMemoryURLIndex::SaveCacheObserver::~SaveCacheObserver() {
InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::
RebuildPrivateDataFromHistoryDBTask(
InMemoryURLIndex* index,
- const std::string& languages,
const SchemeSet& scheme_whitelist)
: index_(index),
- languages_(languages),
scheme_whitelist_(scheme_whitelist),
succeeded_(false) {
}
@@ -56,8 +54,7 @@ InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::
bool InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::RunOnDBThread(
history::HistoryBackend* backend,
history::HistoryDatabase* db) {
- data_ = URLIndexPrivateData::RebuildFromHistory(db, languages_,
- scheme_whitelist_);
+ data_ = URLIndexPrivateData::RebuildFromHistory(db, scheme_whitelist_);
succeeded_ = data_.get() && !data_->Empty();
if (!succeeded_ && data_.get())
data_->Clear();
@@ -81,13 +78,11 @@ InMemoryURLIndex::InMemoryURLIndex(
TemplateURLService* template_url_service,
base::SequencedWorkerPool* worker_pool,
const base::FilePath& history_dir,
- const std::string& languages,
const SchemeSet& client_schemes_to_whitelist)
: bookmark_model_(bookmark_model),
history_service_(history_service),
template_url_service_(template_url_service),
history_dir_(history_dir),
- languages_(languages),
private_data_(new URLIndexPrivateData),
restore_cache_observer_(NULL),
save_cache_observer_(NULL),
@@ -133,7 +128,7 @@ ScoredHistoryMatches InMemoryURLIndex::HistoryItemsForTerms(
size_t cursor_position,
size_t max_matches) {
return private_data_->HistoryItemsForTerms(
- term_string, cursor_position, max_matches, languages_, bookmark_model_,
+ term_string, cursor_position, max_matches, bookmark_model_,
template_url_service_);
}
@@ -151,7 +146,6 @@ void InMemoryURLIndex::OnURLVisited(history::HistoryService* history_service,
DCHECK_EQ(history_service_, history_service);
needs_to_be_cached_ |= private_data_->UpdateURL(history_service_,
row,
- languages_,
scheme_whitelist_,
&private_data_tracker_);
}
@@ -162,7 +156,6 @@ void InMemoryURLIndex::OnURLsModified(history::HistoryService* history_service,
for (const auto& row : changed_urls) {
needs_to_be_cached_ |= private_data_->UpdateURL(history_service_,
row,
- languages_,
scheme_whitelist_,
&private_data_tracker_);
}
@@ -225,7 +218,7 @@ void InMemoryURLIndex::PostRestoreFromCacheFileTask() {
base::PostTaskAndReplyWithResult(
task_runner_.get(),
FROM_HERE,
- base::Bind(&URLIndexPrivateData::RestoreFromFile, path, languages_),
+ base::Bind(&URLIndexPrivateData::RestoreFromFile, path),
base::Bind(&InMemoryURLIndex::OnCacheLoadDone, AsWeakPtr()));
}
@@ -284,7 +277,7 @@ void InMemoryURLIndex::ScheduleRebuildFromHistory() {
history_service_->ScheduleDBTask(
scoped_ptr<history::HistoryDBTask>(
new InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask(
- this, languages_, scheme_whitelist_)),
+ this, scheme_whitelist_)),
&cache_reader_tracker_);
}
@@ -310,7 +303,6 @@ void InMemoryURLIndex::RebuildFromHistory(
history::HistoryDatabase* history_db) {
private_data_tracker_.TryCancelAll();
private_data_ = URLIndexPrivateData::RebuildFromHistory(history_db,
- languages_,
scheme_whitelist_);
}
« no previous file with comments | « components/omnibox/browser/in_memory_url_index.h ('k') | components/omnibox/browser/in_memory_url_index_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698