Omnibox: Make HUP Scoring More Sane in Prevent-Inline Mode

chrome/browser/autocomplete/history_url_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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 139 matching lines @@
   // Tells the provider whether to promote the what you typed match, the first
   // element of |matches|, or neither as the first AutocompleteMatch.  If
   // |exact_suggestion_is_in_history| is true (and thus "the what you typed
   // match" and "the first element of |matches|" represent the same thing), this
   // will be set to WHAT_YOU_TYPED_MATCH.
   //
   // NOTE: The second pass of DoAutocomplete() checks what the first pass set
   // this to.  See comments in DoAutocomplete().
   PromoteType promote_type;
 
+  // True if |what_you_typed_match| is eligible for display.  If this is true,
+  // PromoteMatchesIfNecessary() may choose to place |what_you_typed_match| on
+  // |matches_| even when |promote_type| is not WHAT_YOU_TYPED_MATCH.
+  bool have_what_you_typed_match;
+
   // Languages we should pass to gfx::GetCleanStringFromUrl.
   std::string languages;
 
   // The default search provider and search terms data necessary to cull results
   // that correspond to searches (on the default engine).  These can only be
   // obtained on the UI thread, so we have to copy them into here to pass them
   // to the history thread.  We use a scoped_ptr<TemplateURL> for the DSP since
   // TemplateURLs can't be copied by value. We use a scoped_ptr<SearchTermsData>
   // so that we can store a snapshot of the SearchTermsData accessible from the
   // history thread.
@@ skipping 69 matching lines @@
       const base::string16& input_text,
       const base::string16& description);
 
   // Actually runs the autocomplete job on the given database, which is
   // guaranteed not to be NULL.  Used by both autocomplete passes, and therefore
   // called on multiple different threads (though not simultaneously).
   void DoAutocomplete(history::HistoryBackend* backend,
                       history::URLDatabase* db,
                       HistoryURLProviderParams* params);
 
-  // May promote either the what you typed match or first history match in
-  // params->matches to the front of |matches_|, depending on the value of
-  // params->promote_type.
-  void PromoteMatchIfNecessary(const HistoryURLProviderParams& params);
+  // May promote the what you typed match, the first history match in
+  // parmas->matches, or both to the front of |matches_|, depending on the

[Peter Kasting, 2015/03/20 23:30:19]

params

[Mark P, 2015/03/24 18:23:26]

Done.

+  // values of params->promote_type, params->have_what_you_typed_match, and
+  // params->prevent_inline_autocomplete.
+  void PromoteMatchesIfNecessary(const HistoryURLProviderParams& params);
 
   // Dispatches the results to the autocomplete controller. Called on the
   // main thread by ExecuteWithDB when the results are available.
   // Frees params_gets_deleted on exit.
   void QueryComplete(HistoryURLProviderParams* params_gets_deleted);
 
   // Looks up the info for params->what_you_typed_match in the DB.  If found,
   // fills in the title, promotes the match's priority to that of an inline
   // autocomplete match (maybe it should be slightly better?), and places it on
   // the front of params->matches (so we pick the right matches to throw away
@@ skipping 65 matching lines @@
   // keep this member is so we can set the cancel bit on it.
   HistoryURLProviderParams* params_;
 
   // Params controlling experimental behavior of this provider.
   HUPScoringParams scoring_params_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryURLProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_