From 77c16d74b367f53bc5a63e6f6c35a7fb82b57df7 Mon Sep 17 00:00:00 2001 From: "isherman@chromium.org" Date: Tue, 17 Aug 2010 20:42:48 +0000 Subject: Don't show accidental search infobar for bookmark keywords. BUG=6854 TEST=none Review URL: http://codereview.chromium.org/3119007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56413 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/autocomplete/autocomplete.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome') diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index 9a2508b..e15a190 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -719,7 +719,7 @@ void AutocompleteResult::SortAndCull(const AutocompleteInput& input) { &AutocompleteMatch::DestinationsEqual), matches_.end()); - // Find the top max_matches. + // Find the top |kMaxMatches| matches. if (matches_.size() > kMaxMatches) { std::partial_sort(matches_.begin(), matches_.begin() + kMaxMatches, matches_.end(), &AutocompleteMatch::MoreRelevant); @@ -746,6 +746,7 @@ void AutocompleteResult::SortAndCull(const AutocompleteInput& input) { (input.type() == AutocompleteInput::REQUESTED_URL)) && (default_match_ != end()) && (default_match_->transition != PageTransition::TYPED) && + (default_match_->transition != PageTransition::KEYWORD) && (input.canonicalized_url() != default_match_->destination_url)) alternate_nav_url_ = input.canonicalized_url(); } -- cgit v1.1