Omnibox: Make Keyword Provide More Generous with Matching

components/omnibox/browser/search_provider.h

 // Copyright (c) 2012 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 Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 48 matching lines @@
                  AutocompleteProviderListener* listener);
 
   // Extracts the suggest response metadata which SearchProvider previously
   // stored for |match|.
   static std::string GetSuggestMetadata(const AutocompleteMatch& match);
 
   // Answers prefetch handling - register displayed answers. Takes the top
   // match for Autocomplete and registers the contained answer data, if any.
   void RegisterDisplayedAnswers(const AutocompleteResult& result);
 
+  // Calculates the relevance score for the keyword verbatim result (if the
+  // input matches one of the profile's keyword).

[Peter Kasting, 2015/11/12 20:36:10]

Nit: keyword -> keywords

[Mark P, 2015/11/12 21:42:48]

Done.

+  static int CalculateRelevanceForKeywordVerbatim(
+      metrics::OmniboxInputType::Type type,
+      bool allow_exact_keyword_match,

[Peter Kasting, 2015/11/12 20:36:10]

Nit: Add comments about what this arg means.

[Mark P, 2015/11/12 21:42:48]

Done.

+      bool prefer_keyword);
+
   // AutocompleteProvider:
   void ResetSession() override;
 
  protected:
   ~SearchProvider() override;
 
  private:
   friend class AutocompleteProviderTest;
   friend class SearchProviderTest;
   FRIEND_TEST_ALL_PREFIXES(SearchProviderTest, CanSendURL);
@@ skipping 56 matching lines @@
     base::string16 default_provider_;
     base::string16 keyword_provider_;
 
     DISALLOW_COPY_AND_ASSIGN(Providers);
   };
 
   class CompareScoredResults;
 
   typedef std::vector<history::KeywordSearchTermVisit> HistoryResults;
 
-  // Calculates the relevance score for the keyword verbatim result (if the
-  // input matches one of the profile's keyword).
-  static int CalculateRelevanceForKeywordVerbatim(
-      metrics::OmniboxInputType::Type type,
-      bool prefer_keyword);
-
   // A helper function for UpdateAllOldResults().
   static void UpdateOldResults(bool minimal_changes,
                                SearchSuggestionParser::Results* results);
 
   // Returns the first match in |matches| which might be chosen as default.
   static ACMatches::iterator FindTopMatch(ACMatches* matches);
 
   // AutocompleteProvider:
   void Start(const AutocompleteInput& input, bool minimal_changes) override;
   void Stop(bool clear_cached_results,
@@ skipping 243 matching lines @@
   base::TimeTicks token_expiration_time_;
 
   // Answers prefetch management.
   AnswersCache answers_cache_;  // Cache for last answers seen.
   AnswersQueryData prefetch_data_;  // Data to use for query prefetching.
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_SEARCH_PROVIDER_H_