Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/shortcuts_provider.cc

 // Copyright (c) 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/shortcuts_provider.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <vector>
@@ skipping 156 matching lines @@
       matches_.push_back(ShortcutToACMatch(relevance, term_string, it->second));
   }
   std::partial_sort(matches_.begin(),
       matches_.begin() +
           std::min(AutocompleteProvider::kMaxMatches, matches_.size()),
       matches_.end(), &AutocompleteMatch::MoreRelevant);
   if (matches_.size() > AutocompleteProvider::kMaxMatches) {
     matches_.erase(matches_.begin() + AutocompleteProvider::kMaxMatches,
                    matches_.end());
   }
-  // Reset relevance scores to guarantee no results are given an
-  // inlineable score and all scores are decreasing (but not do assign
-  // any scores below 1).
-  int max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
-  for (ACMatches::iterator it = matches_.begin(); it != matches_.end(); ++it) {
-    max_relevance = std::min(max_relevance, it->relevance);
-    it->relevance = max_relevance;
-    if (max_relevance > 1)
-      --max_relevance;
+  // Reset relevance scores to guarantee no result is given a score that may

[Peter Kasting, 2013/08/06 22:56:16]

Nit: result -> match

[Mark P, 2013/08/07 00:44:31]

Done.

+  // allow it to become the highest ranked match (i.e., the default match)
+  // unless the omnibox will reorder matches as necessary to correct the
+  // problem.  In the process of resetting scores, guarantee that all scores

[Peter Kasting, 2013/08/06 22:56:16]

Nit: You may want to say why this is a problem (or in what circumstances it's a
problem?)

[Mark P, 2013/08/07 00:44:31]

Added a comment.  Not sure if it help or hurts.

+  // are decreasing (but not do assign any scores below 1).
+  if (!OmniboxFieldTrial::ReorderForLegalDefaultMatch(
+          input.current_page_classification())) {

[Peter Kasting, 2013/08/06 22:56:16]

Nit: Indent 4, not 8

[Mark P, 2013/08/07 00:44:31]

Done.

+    int max_relevance = AutocompleteResult::kLowestDefaultScore - 1;
+    for (ACMatches::iterator it = matches_.begin(); it != matches_.end();
+        ++it) {
+      max_relevance = std::min(max_relevance, it->relevance);
+      it->relevance = max_relevance;
+      if (max_relevance > 1)
+        --max_relevance;
+    }
   }
 }
 
 AutocompleteMatch ShortcutsProvider::ShortcutToACMatch(
     int relevance,
     const string16& term_string,
     const history::ShortcutsBackend::Shortcut& shortcut) {
   DCHECK(!term_string.empty());
   AutocompleteMatch match(this, relevance, true,
                           AutocompleteMatchType::HISTORY_TITLE);
@@ skipping 168 matching lines @@
   // (1.0 / each 5 additional hits), up to a maximum of 5x as long.
   const double kMaxDecaySpeedDivisor = 5.0;
   const double kNumUsesPerDecaySpeedDivisorIncrement = 5.0;
   double decay_divisor = std::min(kMaxDecaySpeedDivisor,
       (shortcut.number_of_hits + kNumUsesPerDecaySpeedDivisorIncrement - 1) /
       kNumUsesPerDecaySpeedDivisorIncrement);
 
   return static_cast<int>((base_score / exp(decay_exponent / decay_divisor)) +
       0.5);
 }