Omnibox: Make Keyword Provide More Generous with Matching

components/omnibox/browser/keyword_provider.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file contains the keyword autocomplete provider. The keyword provider
 // is responsible for remembering/suggesting user "search keyword queries"
 // (e.g.  "imdb Godzilla") and then fixing them up into valid URLs.  An
 // instance of it gets created and managed by the autocomplete controller.
 // KeywordProvider uses a TemplateURLService to find the set of keywords.
 
@@ skipping 93 matching lines @@
   // is valid and has a keyword. This makes use of SplitKeywordFromInput to
   // extract the keyword and remaining string, and uses
   // TemplateURLService::CleanUserInputKeyword to remove unnecessary characters.
   // In general use this instead of SplitKeywordFromInput.
   // Leading whitespace in |*remaining_input| will be trimmed.
   static bool ExtractKeywordFromInput(const AutocompleteInput& input,
                                       base::string16* keyword,
                                       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 sufficiently_complete,
                                 bool support_replacement,
                                 bool prefer_keyword,
                                 bool allow_exact_keyword_match);
 
   // Creates a fully marked-up AutocompleteMatch from the user's input.
   // If |relevance| is negative, calculate a relevance based on heuristics.
   AutocompleteMatch CreateAutocompleteMatch(
       const TemplateURL* template_url,
+      const size_t meaningful_keyword_length,
       const AutocompleteInput& input,
       size_t prefix_length,
       const base::string16& remaining_input,
       bool allowed_to_be_default_match,
       int relevance);
 
   // Fills in the "destination_url" and "contents" fields of |match| with the
   // provided user input and keyword data.
   void FillInURLAndContents(const base::string16& remaining_input,
                             const TemplateURL* element,
                             AutocompleteMatch* match) const;
 
   TemplateURLService* GetTemplateURLService() const;
 
   AutocompleteProviderListener* listener_;
 
   // Model for the keywords.
   TemplateURLService* model_;
 
   // Delegate to handle the extensions-only logic for KeywordProvider.
   // NULL when extensions are not enabled. May be NULL for tests.
   scoped_ptr<KeywordExtensionsDelegate> extensions_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(KeywordProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_