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

Unified Diff: chrome/browser/autocomplete/autocomplete_controller.cc

Issue 399063002: Remove BaseSearchProvider::set_in_app_list (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typo Created 6 years, 5 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: chrome/browser/autocomplete/autocomplete_controller.cc
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc
index 868b65d06e1cea510a97bc5c9d2ef131b4429a8f..6edb288a2b52a8c4e8ad65acfd9b0206785167bc 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.cc
+++ b/chrome/browser/autocomplete/autocomplete_controller.cc
@@ -389,12 +389,10 @@ void AutocompleteController::ResetSession() {
(*i)->ResetSession();
}
-void AutocompleteController::UpdateMatchDestinationURL(
+void AutocompleteController::UpdateMatchDestinationURLWithQueryFormulationTime(
base::TimeDelta query_formulation_time,
AutocompleteMatch* match) const {
- TemplateURL* template_url = match->GetTemplateURL(
- template_url_service_, false);
- if (!template_url || !match->search_terms_args.get() ||
+ if (!match->search_terms_args.get() ||
match->search_terms_args->assisted_query_stats.empty())
return;
@@ -410,6 +408,17 @@ void AutocompleteController::UpdateMatchDestinationURL(
(zero_suggest_provider_ &&
zero_suggest_provider_->field_trial_triggered_in_session()),
input_.current_page_classification());
+ UpdateMatchDestinationURL(search_terms_args, match);
+}
+
+void AutocompleteController::UpdateMatchDestinationURL(
+ const TemplateURLRef::SearchTermsArgs& search_terms_args,
+ AutocompleteMatch* match) const {
+ TemplateURL* template_url = match->GetTemplateURL(
+ template_url_service_, false);
+ if (!template_url)
+ return;
+
match->destination_url = GURL(template_url->url_ref().ReplaceSearchTerms(
search_terms_args, template_url_service_->search_terms_data()));
}
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_controller.h ('k') | chrome/browser/autocomplete/autocomplete_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698