Index: chrome/browser/autocomplete/history_url_provider.h |
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h |
index 57a91ecae1c083e3567770db87318a9b1634f71f..dc3bcb5dd333e0600833c8e1f0346f12c57c429d 100644 |
--- a/chrome/browser/autocomplete/history_url_provider.h |
+++ b/chrome/browser/autocomplete/history_url_provider.h |
@@ -91,6 +91,7 @@ class URLDatabase; |
struct HistoryURLProviderParams { |
HistoryURLProviderParams(const AutocompleteInput& input, |
bool trim_http, |
+ const AutocompleteMatch& what_you_typed_match, |
const std::string& languages, |
TemplateURL* default_search_provider, |
const SearchTermsData& search_terms_data); |
@@ -110,6 +111,9 @@ struct HistoryURLProviderParams { |
// Set when "http://" should be trimmed from the beginning of the URLs. |
bool trim_http; |
+ // A match corresponding to what the user typed. |
+ AutocompleteMatch what_you_typed_match; |
+ |
// Set by the main thread to cancel this request. If this flag is set when |
// the query runs, the query will be abandoned. This allows us to avoid |
// running queries that are no longer needed. Since we don't care if we run |
@@ -229,9 +233,8 @@ class HistoryURLProvider : public HistoryProvider { |
// the front of |matches| (so we pick the right matches to throw away |
// when culling redirects to/from it). Returns whether a match was promoted. |
bool FixupExactSuggestion(history::URLDatabase* db, |
- const AutocompleteInput& input, |
const VisitClassifier& classifier, |
- AutocompleteMatch* match, |
+ HistoryURLProviderParams* params, |
history::HistoryMatches* matches) const; |
// Helper function for FixupExactSuggestion, this returns true if the input |
@@ -240,9 +243,8 @@ class HistoryURLProvider : public HistoryProvider { |
bool CanFindIntranetURL(history::URLDatabase* db, |
const AutocompleteInput& input) const; |
- // Determines if |match| is suitable for inline autocomplete. If so, and if |
- // |params| is non-NULL, promotes the match. Returns whether |match| is |
- // suitable for inline autocomplete. |
+ // Determines if |match| is suitable for inline autocomplete. If so, promotes |
+ // the match. Returns whether |match| was promoted. |
bool PromoteMatchForInlineAutocomplete(const history::HistoryMatch& match, |
HistoryURLProviderParams* params); |
@@ -256,7 +258,6 @@ class HistoryURLProvider : public HistoryProvider { |
history::URLDatabase* db, |
const HistoryURLProviderParams& params, |
bool have_what_you_typed_match, |
- const AutocompleteMatch& what_you_typed_match, |
history::HistoryMatches* matches); |
// Removes results that have been rarely typed or visited, and not any time |