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

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

Issue 11198074: Initial implementation of dedupping search provider's URLs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressed comments. 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_controller.cc
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc
index 572796dced88e4a1c37d73345e15006777e84cc2..ee5954047a841c42f46d8411886402c64263721b 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.cc
+++ b/chrome/browser/autocomplete/autocomplete_controller.cc
@@ -278,7 +278,7 @@ void AutocompleteController::OnProviderUpdate(bool updated_matches) {
// because results from other providers are stale.
result_.Reset();
result_.AppendMatches(zero_suggest_provider_->matches());
- result_.SortAndCull(input_);
+ result_.SortAndCull(input_, profile_);
NotifyChanged(true);
} else {
CheckIfDone();
@@ -311,7 +311,7 @@ void AutocompleteController::UpdateResult(bool is_synchronous_pass) {
result_.AppendMatches((*i)->matches());
// Sort the matches and trim to a small number of "best" matches.
- result_.SortAndCull(input_);
+ result_.SortAndCull(input_, profile_);
// Need to validate before invoking CopyOldMatches as the old matches are not
// valid against the current input.
@@ -322,7 +322,7 @@ void AutocompleteController::UpdateResult(bool is_synchronous_pass) {
if (!done_) {
// This conditional needs to match the conditional in Start that invokes
// StartExpireTimer.
- result_.CopyOldMatches(input_, last_result);
+ result_.CopyOldMatches(input_, last_result, profile_);
}
UpdateKeywordDescriptions(&result_);
« no previous file with comments | « no previous file | chrome/browser/autocomplete/autocomplete_match.h » ('j') | chrome/browser/autocomplete/autocomplete_match.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698