Index: chrome/browser/autocomplete/autocomplete_match.h |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_match.h (revision 79782) |
+++ chrome/browser/autocomplete/autocomplete_match.h (working copy) |
@@ -103,7 +103,15 @@ |
const AutocompleteMatch& elem2); |
static bool DestinationsEqual(const AutocompleteMatch& elem1, |
const AutocompleteMatch& elem2); |
+ static bool NormalizedSortFunc(const AutocompleteMatch& elem1, |
+ const AutocompleteMatch& elem2); |
+ static bool NormalizedEqual(const AutocompleteMatch& elem1, |
+ const AutocompleteMatch& elem2); |
+ // Comparison function for finding duplicate keywords |
+ static bool KeywordsEqual(const AutocompleteMatch& elem1, |
+ const AutocompleteMatch& elem2); |
+ |
// Helper functions for classes creating matches: |
// Fills in the classifications for |text|, using |style| as the base style |
// and marking the first instance of |find_text| as a match. (This match |
@@ -123,6 +131,9 @@ |
int style, |
ACMatchClassifications* classifications); |
+ // Copies the destination_url with "www." stripped off to normalized_url |
+ void NormalizeDestination(); |
Peter Kasting
2011/04/01 00:09:09
Nit: Perhaps "void ComputeStrippedDestinationURL()
|
+ |
// The provider of this match, used to remember which provider the user had |
// selected when the input changes. This may be NULL, in which case there is |
// no provider (or memory of the user's selection). |
@@ -155,6 +166,9 @@ |
// It may be empty if there is no possible navigation. |
GURL destination_url; |
+ // The destination URL with "www." stripped off for better dupe finding. |
+ GURL normalized_url; |
Peter Kasting
2011/04/01 00:09:09
Nit: This would be more explicit as |destination_u
|
+ |
// The main text displayed in the address bar dropdown. |
string16 contents; |
ACMatchClassifications contents_class; |
@@ -179,6 +193,9 @@ |
// keyword was obtained from. |
const TemplateURL* template_url; |
+ // Cached keyword for this match |
+ mutable string16 keyword; |
+ |
// True if the user has starred the destination URL. |
bool starred; |