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

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

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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/history_quick_provider.cc
diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc
index bf7db5ce95da22ee63ba407bc605928b8117abde..fbf54ac57bb7455ff6dfc2bcae3e9639b23c55b5 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -38,7 +38,6 @@ bool HistoryQuickProvider::disabled_ = false;
HistoryQuickProvider::HistoryQuickProvider(AutocompleteProviderClient* client)
: HistoryProvider(AutocompleteProvider::TYPE_HISTORY_QUICK, client),
- languages_(client->GetAcceptLanguages()),
in_memory_url_index_(client->GetInMemoryURLIndex()) {
}
@@ -209,7 +208,7 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
~(!history_match.match_in_scheme ? 0 : url_formatter::kFormatUrlOmitHTTP);
base::OffsetAdjuster::Adjustments adjustments;
match.contents = url_formatter::FormatUrlWithAdjustments(
- info.url(), languages_, format_types, net::UnescapeRule::SPACES, nullptr,
+ info.url(), format_types, net::UnescapeRule::SPACES, nullptr,
nullptr, &adjustments);
match.fill_into_edit =
AutocompleteInput::FormattedStringWithEquivalentMeaning(
@@ -242,9 +241,7 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
match.allowed_to_be_default_match = match.inline_autocompletion.empty() ||
!PreventInlineAutocomplete(autocomplete_input_);
}
- match.EnsureUWYTIsAllowedToBeDefault(
- autocomplete_input_,
- client()->GetAcceptLanguages(),
+ match.EnsureUWYTIsAllowedToBeDefault(autocomplete_input_,
client()->GetTemplateURLService());
Peter Kasting 2016/04/05 02:42:32 Nit: All lines of args must be indented the same
jungshik at Google 2016/04/05 18:56:18 Done.
// Format the description autocomplete presentation.

Powered by Google App Engine
This is Rietveld 408576698