Omnibox: Make Keyword Provide More Generous with Matching

components/omnibox/browser/keyword_provider.h

Index: components/omnibox/browser/keyword_provider.h
diff --git a/components/omnibox/browser/keyword_provider.h b/components/omnibox/browser/keyword_provider.h
index 3be6313b92879f016bf15535633b11c907052558..1e63cd676b5ad771aa4bf213b28d39da79dddcdd 100644
--- a/components/omnibox/browser/keyword_provider.h
+++ b/components/omnibox/browser/keyword_provider.h
@@ -111,12 +111,13 @@ class KeywordProvider : public AutocompleteProvider {
                                       base::string16* remaining_input);
 
   // Determines the relevance for some input, given its type, whether the user
-  // typed the complete keyword, and whether the user is in "prefer keyword
-  // matches" mode, and whether the keyword supports replacement.
-  // If |allow_exact_keyword_match| is false, the relevance for complete
-  // keywords that support replacements is degraded.
+  // typed the complete keyword (or close to it), and whether the user is in
+  // "prefer keyword matches" mode, and whether the keyword supports
+  // replacement. If |allow_exact_keyword_match| is false, the relevance for
+  // complete keywords that support replacements is degraded.
   static int CalculateRelevance(metrics::OmniboxInputType::Type type,
                                 bool complete,
+                                bool nearly_complete,

[Peter Kasting, 2015/11/09 23:11:14]

Nit: |sufficiently_complete| seems less misleading, as that more clearly covers
both complete and incomplete cases.

If you agree, update all the function/type names and comments in other files to
match.

[Mark P, 2015/11/11 07:41:00]

Makes sense to me.
Done.

                                 bool support_replacement,
                                 bool prefer_keyword,
                                 bool allow_exact_keyword_match);
@@ -125,6 +126,7 @@ class KeywordProvider : public AutocompleteProvider {
   // If |relevance| is negative, calculate a relevance based on heuristics.
   AutocompleteMatch CreateAutocompleteMatch(
       const TemplateURL* template_url,
+      const size_t effective_keyword_length,

[Peter Kasting, 2015/11/09 23:11:14]

Nit: How about |meaningful_keyword_length|?  I'm not sure I would say that
"foo.com" is "effectively three characters" but I would be more willing to say
that it has "three meaningful characters".

[Mark P, 2015/11/11 07:41:00]

That sounds reasonable.  With that in mind, I change the template_url_service
stuff to talk about MeaningfulLength, not EffectiveLength.

       const AutocompleteInput& input,
       size_t prefix_length,
       const base::string16& remaining_input,