Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1039)

Unified Diff: chrome/browser/autocomplete/autocomplete_result.cc

Issue 11198074: Initial implementation of dedupping search provider's URLs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Add a missing include. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/autocomplete_result.cc
diff --git a/chrome/browser/autocomplete/autocomplete_result.cc b/chrome/browser/autocomplete/autocomplete_result.cc
index 12256e27da5cb385f1e61510e6cd7885beece8e0..3d01ce20e3e77c6df5b382c3d8f78370fe5cc858 100644
--- a/chrome/browser/autocomplete/autocomplete_result.cc
+++ b/chrome/browser/autocomplete/autocomplete_result.cc
@@ -47,7 +47,8 @@ void AutocompleteResult::CopyFrom(const AutocompleteResult& rhs) {
}
void AutocompleteResult::CopyOldMatches(const AutocompleteInput& input,
- const AutocompleteResult& old_matches) {
+ const AutocompleteResult& old_matches,
+ Profile* profile) {
if (old_matches.empty())
return;
@@ -82,7 +83,7 @@ void AutocompleteResult::CopyOldMatches(const AutocompleteInput& input,
MergeMatchesByProvider(i->second, matches_per_provider[i->first]);
}
- SortAndCull(input);
+ SortAndCull(input, profile);
}
void AutocompleteResult::AppendMatches(const ACMatches& matches) {
@@ -112,9 +113,10 @@ void AutocompleteResult::AddMatch(const AutocompleteMatch& match) {
default_match_ = begin() + default_offset;
}
-void AutocompleteResult::SortAndCull(const AutocompleteInput& input) {
+void AutocompleteResult::SortAndCull(const AutocompleteInput& input,
+ Profile* profile) {
for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i)
- i->ComputeStrippedDestinationURL();
+ i->ComputeStrippedDestinationURL(profile);
// Remove duplicates.
std::sort(matches_.begin(), matches_.end(),
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_result.h ('k') | chrome/browser/autocomplete/autocomplete_result_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698