Restyle omnibox popup

chrome/browser/autocomplete/search_provider.cc

 // Copyright 2012 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.
 
 #include "chrome/browser/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 148 matching lines @@
     } else {
       // TODO(beng): ACMatchClassification::MATCH now seems to just mean
       //             "bold" this. Consider modifying the terminology.
       // We don't iterate over the string here annotating all matches because
       // it looks odd to have every occurrence of a substring that may be as
       // short as a single character highlighted in a query suggestion result,
       // e.g. for input text "s" and query string "southwest airlines", it
       // looks odd if both the first and last s are highlighted.
       if (input_position != 0) {
         match.contents_class.push_back(
-            ACMatchClassification(0, ACMatchClassification::NONE));
+            ACMatchClassification(0, ACMatchClassification::MATCH));
       }
       match.contents_class.push_back(
-          ACMatchClassification(input_position, ACMatchClassification::DIM));
+          ACMatchClassification(input_position, ACMatchClassification::NONE));
       size_t next_fragment_position = input_position + input_text.length();
       if (next_fragment_position < query_string.length()) {
         match.contents_class.push_back(
             ACMatchClassification(next_fragment_position,
-                                  ACMatchClassification::NONE));
+                                  ACMatchClassification::MATCH));
       }
     }
   } else {
     // Otherwise, we're dealing with the "default search" result which has no
     // completion.
     match.contents_class.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
   }
 
   // When the user forced a query, we need to make sure all the fill_into_edit
@@ skipping 441 matching lines @@
 
   // Request history for both the keyword and default provider.  We grab many
   // more matches than we'll ultimately clamp to so that if there are several
   // recent multi-word matches who scores are lowered (see
   // AddHistoryResultsToMap()), they won't crowd out older, higher-scoring
   // matches.  Note that this doesn't fix the problem entirely, but merely
   // limits it to cases with a very large number of such multi-word matches; for
   // now, this seems OK compared with the complexity of a real fix, which would
   // require multiple searches and tracking of "single- vs. multi-word" in the
   // database.
-  int num_matches = kMaxMatches * 5;
+  int num_matches = kMaxSuggestMatches * 4;

[brettw, 2013/06/04 23:43:12]

This change needs to be reverted.

[Peter Kasting, 2013/06/06 18:52:16]

I assume you wrote this because you've reverted them locally but didn't want to
upload a new patch.

   const TemplateURL* default_url = providers_.GetDefaultProviderURL();
   if (default_url) {
     url_db->GetMostRecentKeywordSearchTerms(default_url->id(), input_.text(),
         num_matches, &default_history_results_);
   }
   const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
   if (keyword_url) {
     url_db->GetMostRecentKeywordSearchTerms(keyword_url->id(),
         keyword_input_.text(), num_matches, &keyword_history_results_);
   }
@@ skipping 449 matching lines @@
         NavigationResult(*this,
                          GURL(UTF16ToUTF8(default_provider_suggestion_.text)),
                          string16(),
                          false,
                          kNonURLVerbatimRelevance + 1)));
   }
   AddNavigationResultsToMatches(keyword_results_.navigation_results, true);
   AddNavigationResultsToMatches(default_results_.navigation_results, false);
 
   // Allow additional match(es) for verbatim results if present.
-  const size_t max_total_matches = kMaxMatches + verbatim_matches_size;
+  const size_t max_total_matches = kMaxSuggestMatches + verbatim_matches_size;

[brettw, 2013/06/04 23:43:12]

Ditto

   std::partial_sort(matches_.begin(),
       matches_.begin() + std::min(max_total_matches, matches_.size()),
       matches_.end(), &AutocompleteMatch::MoreRelevant);
 
   if (matches_.size() > max_total_matches)
     matches_.resize(max_total_matches);
 }
 
 bool SearchProvider::IsTopMatchNavigationInKeywordMode() const {
   return (!providers_.keyword_provider().empty() &&
@@ skipping 482 matching lines @@
     it->set_relevance(max_query_relevance);
   }
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on Instant.
   done_ = IsNonInstantSearchDone() &&
       (instant_finalized_ || !chrome::IsInstantEnabled(profile_));
 }