Add confidence to AutocompleteMatch.

chrome/browser/autocomplete/history_contents_provider.h

 // Copyright (c) 2011 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_CONTENTS_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H_
 #pragma once
 
 #include "chrome/browser/autocomplete/history_provider.h"
 #include "chrome/browser/history/history.h"
 
+struct MatchReference;

[Peter Kasting, 2011/08/09 20:53:00]

Nit: Shouldn't this be moved inside HistoryContentsProvider if subclasses need
it, rather than made global?

[dominich, 2011/08/09 21:43:43]

I went back and forward on this a couple of times. I think you're right to keep
the scope limited.

+
 namespace bookmark_utils {
 struct TitleMatch;
 }
 
 // HistoryContentsProvider is an AutocompleteProvider that provides results from
 // the contents (body and/or title) of previously visited pages.
 // HistoryContentsProvider gets results from two sources:
 // . HistoryService: this provides results for matches in the body/title of
 //   previously viewed pages. This is asynchronous.
 // . BookmarkModel: provides results for matches in the titles of bookmarks.
@@ skipping 16 matching lines @@
   virtual ~HistoryContentsProvider();
 
   void QueryComplete(HistoryService::Handle handle,
                      history::QueryResults* results);
 
   // Converts each MatchingPageResult in results_ to an AutocompleteMatch and
   // adds it to matches_.
   void ConvertResults();
 
   // Creates and returns an AutocompleteMatch from a MatchingPageResult.
-  AutocompleteMatch ResultToMatch(const history::URLResult& result,
-                                  int score);
+  AutocompleteMatch ResultToMatch(const MatchReference& match_reference);
 
   // Adds ACMatchClassifications to match from the offset positions in
   // page_result.
   void ClassifyDescription(const history::URLResult& result,
                            AutocompleteMatch* match) const;
 
   // Calculates and returns the relevance of a particular result. See the
   // chart in autocomplete.h for the list of values this returns.
   int CalculateRelevance(const history::URLResult& result);
 
+  // Calculates and returns the confidence for a particular result. This is
+  // calculated by comparing the result's |visit_count| to that of all the
+  // results.
+  float CalculateConfidence(const history::URLResult& result,
+                            const history::QueryResults& results) const;
+
   // Queries the bookmarks for any bookmarks whose title matches input. All
   // matches are added directly to results_.
   void QueryBookmarks(const AutocompleteInput& input);
 
   // Converts a BookmarkModel::TitleMatch to a QueryResult and adds it to
   // results_.
   void AddBookmarkTitleMatchToResults(const bookmark_utils::TitleMatch& match);
 
   // Return true if the search term can be found in the title of |result|.
   bool MatchInTitle(const history::URLResult& result);
@@ skipping 26 matching lines @@
   // Whether results_ is valid (so we can tell invalid apart from empty).
   bool have_results_;
 
   // Current query string.
   string16 query_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryContentsProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H_