Omnibox: Create Keyword Verbatim Result in Search Provider

chrome/browser/autocomplete/search_provider.cc

Index: chrome/browser/autocomplete/search_provider.cc
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 830293131631e74baa5e56e2177586a83b572eb6..6001bea195ba5f4a495c20a35658c60311ef307a 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -779,7 +779,6 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
   int did_not_accept_keyword_suggestion = keyword_suggest_results_.empty() ?
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE :
       TemplateURLRef::NO_SUGGESTION_CHOSEN;
-  // Keyword what you typed results are handled by the KeywordProvider.
 
   int verbatim_relevance = GetVerbatimRelevance();
   int did_not_accept_default_suggestion = default_suggest_results_.empty() ?
@@ -790,6 +789,15 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
                   AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
                   did_not_accept_default_suggestion, false, &map);
   }
+  const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
+  if (!keyword_input_text_.empty() && keyword_url &&

[Bart N., 2013/01/29 18:50:42]

Most of the time keyword_input_text_ is empty, so it'd be worth to optimize this
code by moving 
const TemplateURL* keyword_url = providers_.GetKeywordProviderURL()
after the if condition.

I know Peter doesn't like assignments in if clauses, but you can nest ifs if you
want.

[Mark P, 2013/01/30 19:46:21]

Done.  (Perhaps I have too much respect for optimizing compilers.)

+      !keyword_url->IsExtensionKeyword()) {

[Bart N., 2013/01/29 18:50:42]

It's not clear to me why we ignore extension keyword here. Mind adding a comment
or pointing to relevant documentation?

[Mark P, 2013/01/30 19:46:21]

Done.

+    AddMatchToMap(keyword_input_text_, keyword_input_text_,
+                  CalculateRelevanceForKeywordVerbatim(
+                      input_.type(), input_.prefer_keyword()),
+                  AutocompleteMatch::SEARCH_OTHER_ENGINE,
+                  did_not_accept_keyword_suggestion, true, &map);
+  }
   const size_t what_you_typed_size = map.size();
   if (!default_provider_suggestion_.text.empty() &&
       default_provider_suggestion_.type == INSTANT_SUGGESTION_SEARCH &&
@@ -826,7 +834,7 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
   AddNavigationResultsToMatches(keyword_navigation_results_, true);
   AddNavigationResultsToMatches(default_navigation_results_, false);
 
-  // Allow an additional match for "what you typed" if it's present.
+  // Allow additional match(es) for "what you typed" results if present.

[Bart N., 2013/01/29 18:50:42]

If I read the code correctly, we may end up with 5 matches, because
what_you_typed_size can be 2. Is this expected?

[Mark P, 2013/01/30 19:46:21]

Yes.

   const size_t max_total_matches = kMaxMatches + what_you_typed_size;

[Bart N., 2013/01/29 18:50:42]

Technically, this is not "what you typed" matches, because in case of
SEARCH_OTHER_ENGINE case you've added above, we are adding partial query
(keyword is stripped from the original query).

I'd rename this variable to something like verbatim or "trivial_matches_size"
etc.

[Mark P, 2013/01/30 19:46:21]

Done.

   std::partial_sort(matches_.begin(),
       matches_.begin() + std::min(max_total_matches, matches_.size()),
@@ -1086,6 +1094,15 @@ int SearchProvider::CalculateRelevanceForVerbatim() const {
   }
 }
 
+// static
+int SearchProvider::CalculateRelevanceForKeywordVerbatim(
+    AutocompleteInput::Type type,
+    bool prefer_keyword) {
+  if (prefer_keyword)
+    return 1500;
+  return (type == AutocompleteInput::QUERY) ? 1450 : 1100;

[Bart N., 2013/01/29 18:50:42]

Nit: We don't need () around the first expression.

It looks like the only case we can beat keyword verbatim suggestion is when we
don't prefer keyword and input is non-query, e.g. URL.

BTW, under which circumstances can we get keyword verbatim and prefer_keyword is
false?

[Mark P, 2013/01/30 19:46:21]

Done.
Correct.

Though this will change in a follow-up changelist once I turn on suggested
relevance scores for keyword providers.
If you paste text into the omnibox that starts with a keyword, the omnibox will
not go into keyword mode.  This means prefer_keyword is false and yet you'll get
keyword suggestions.

+}
+
 int SearchProvider::CalculateRelevanceForHistory(
     const Time& time,
     bool is_keyword,