Commit d5566761 authored by Dave Schuyler's avatar Dave Schuyler Committed by Commit Bot

[Omnibox] Annotate parameter (comments only)

This Cl annotates parameters to the SearchResult ctor. It only adds
comments. There's no logic changes.

Bug: None
Change-Id: Icb625ce10e6fb61216250c96e62057e1d7c9091b
Reviewed-on: https://chromium-review.googlesource.com/991397Reviewed-by: default avatarMark Pearson <mpearson@chromium.org>
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547772}
parent 20777b40
......@@ -996,10 +996,17 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
}
SearchSuggestionParser::SuggestResult verbatim(
trimmed_verbatim, AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, 0,
trimmed_verbatim, base::string16(), base::string16(), answer_contents,
answer_type, std::move(answer), std::string(), std::string(), false,
verbatim_relevance, relevance_from_server, false, trimmed_verbatim);
/*suggestion=*/trimmed_verbatim,
AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
/*subtype_identifier=*/0,
/*match_contents=*/trimmed_verbatim,
/*match_contents_prefix=*/base::string16(),
/*annotation=*/base::string16(), answer_contents, answer_type,
std::move(answer), /*suggest_query_params=*/std::string(),
/*deletion_url=*/std::string(),
/*from_keyword_provider=*/false, verbatim_relevance,
relevance_from_server, /*should_prefetch=*/false,
/*input_text=*/trimmed_verbatim);
AddMatchToMap(verbatim, std::string(), did_not_accept_default_suggestion,
false, keyword_url != nullptr, &map);
}
......@@ -1019,11 +1026,21 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
const base::string16& trimmed_verbatim =
base::CollapseWhitespace(keyword_input_.text(), false);
SearchSuggestionParser::SuggestResult verbatim(
trimmed_verbatim, AutocompleteMatchType::SEARCH_OTHER_ENGINE, 0,
trimmed_verbatim, base::string16(), base::string16(),
base::string16(), base::string16(), nullptr, std::string(),
std::string(), true, keyword_verbatim_relevance,
keyword_relevance_from_server, false, trimmed_verbatim);
/*suggestion=*/trimmed_verbatim,
AutocompleteMatchType::SEARCH_OTHER_ENGINE,
/*subtype_identifier=*/0,
/*match_contents=*/trimmed_verbatim,
/*match_contents_prefix=*/base::string16(),
/*annotation=*/base::string16(),
/*answer_contents=*/base::string16(),
/*answer_type=*/base::string16(),
/*answer=*/nullptr,
/*suggest_query_params=*/std::string(),
/*deletion_url=*/std::string(),
/*from_keyword_provider=*/true, keyword_verbatim_relevance,
keyword_relevance_from_server,
/*should_prefetch=*/false,
/*input_text=*/trimmed_verbatim);
AddMatchToMap(verbatim, std::string(),
did_not_accept_keyword_suggestion, false, true, &map);
}
......@@ -1205,10 +1222,19 @@ SearchProvider::ScoreHistoryResultsHelper(const HistoryResults& results,
insertion_position = scored_results.begin();
}
SearchSuggestionParser::SuggestResult history_suggestion(
trimmed_suggestion, AutocompleteMatchType::SEARCH_HISTORY, 0,
trimmed_suggestion, base::string16(), base::string16(),
base::string16(), base::string16(), nullptr, std::string(),
std::string(), is_keyword, relevance, false, false, trimmed_input);
/*suggestion=*/trimmed_suggestion,
AutocompleteMatchType::SEARCH_HISTORY,
/*subtype_identifier=*/0,
/*match_contents=*/trimmed_suggestion,
/*match_contents_prefix=*/base::string16(),
/*annotation=*/base::string16(),
/*answer_contents=*/base::string16(),
/*answer_type=*/base::string16(),
/*answer=*/nullptr,
/*suggest_query_params=*/std::string(),
/*deletion_url=*/std::string(), is_keyword, relevance,
/*relevance_from_server=*/false,
/*should_prefetch=*/false, /*input_text=*/trimmed_input);
// History results are synchronous; they are received on the last keystroke.
history_suggestion.set_received_after_last_keystroke(false);
scored_results.insert(insertion_position, history_suggestion);
......
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