Omnibox: Make HistoryURL Highlight Titles like HistoryQuick Provider

chrome/browser/history/scored_history_match.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/history/scored_history_match.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 #include <numeric>
@@ skipping 227 matching lines @@
   }
 
   // URLs that have been visited more often are better.
   if (m1.url_info.visit_count() != m2.url_info.visit_count())
     return m1.url_info.visit_count() > m2.url_info.visit_count();
 
   // URLs that have been visited more recently are better.
   return m1.url_info.last_visit() > m2.url_info.last_visit();
 }
 
+// static
+TermMatches ScoredHistoryMatch::FilterTermMatchesByWordStarts(
+    const TermMatches& term_matches,
+    const WordStarts& word_starts,
+    const size_t start_pos) {
+  if (start_pos == std::string::npos)
+    return term_matches;
+  TermMatches filtered_matches;
+  WordStarts::const_iterator next_word_starts = word_starts.begin();
+  WordStarts::const_iterator end_word_starts = word_starts.end();
+  for (TermMatches::const_iterator iter = term_matches.begin();
+       iter != term_matches.end(); ++iter) {
+    // Advance next_word_starts until it's >= the position of the term
+    // we're considering.
+    while ((next_word_starts != end_word_starts) &&
+           (*next_word_starts < iter->offset))
+      ++next_word_starts;
+    // Add the match if it's before the position we start filtering at or
+    // if it's at a word boundary.
+    if ((iter->offset < start_pos) ||
+        ((next_word_starts != end_word_starts) &&
+         (*next_word_starts == iter->offset)))
+      filtered_matches.push_back(*iter);
+  }
+  return filtered_matches;
+}
+
 float ScoredHistoryMatch::GetTopicalityScore(
     const int num_terms,
     const string16& url,
     const RowWordStarts& word_starts) {
   // Because the below thread is not thread safe, we check that we're
   // only calling it from one thread: the UI thread.  Specifically,
   // we check "if we've heard of the UI thread then we'd better
   // be on it."  The first part is necessary so unit tests pass.  (Many
   // unit tests don't set up the threading naming system; hence
   // CurrentlyOn(UI thread) will fail.)
@@ skipping 109 matching lines @@
         (term_scores[i] >= kMaxRawTermScore) ? (kMaxRawTermScore - 1) :
         term_scores[i]];
   }
   // TODO(mpearson): If there are multiple terms, consider taking the
   // geometric mean of per-term scores rather than the arithmetic mean.
 
   return topicality_score / num_terms;
 }
 
 // static
-TermMatches ScoredHistoryMatch::FilterTermMatchesByWordStarts(
-    const TermMatches& term_matches,
-    const WordStarts& word_starts,
-    const size_t start_pos) {
-  if (start_pos == std::string::npos)
-    return term_matches;
-  TermMatches filtered_matches;
-  WordStarts::const_iterator next_word_starts = word_starts.begin();
-  WordStarts::const_iterator end_word_starts = word_starts.end();
-  for (TermMatches::const_iterator iter = term_matches.begin();
-       iter != term_matches.end(); ++iter) {
-    // Advance next_word_starts until it's >= the position of the term
-    // we're considering.
-    while ((next_word_starts != end_word_starts) &&
-           (*next_word_starts < iter->offset))
-      ++next_word_starts;
-    // Add the match if it's before the position we start filtering at or
-    // if it's at a word boundary.
-    if ((iter->offset < start_pos) ||
-        ((next_word_starts != end_word_starts) &&
-         (*next_word_starts == iter->offset)))
-      filtered_matches.push_back(*iter);
-  }
-  return filtered_matches;
-}
-
-// static
 void ScoredHistoryMatch::FillInTermScoreToTopicalityScoreArray() {
   for (int term_score = 0; term_score < kMaxRawTermScore; ++term_score) {
     float topicality_score;
     if (term_score < 10) {
       // If the term scores less than 10 points (no full-credit hit, or
       // no combination of hits that score that well), then the topicality
       // score is linear in the term score.
       topicality_score = 0.1 * term_score;
     } else {
       // For term scores of at least ten points, pass them through a log
@@ skipping 145 matching lines @@
   // results to preserve this behavior.
   if (also_do_hup_like_scoring_) {
     max_assigned_score_for_non_inlineable_matches_ =
         HistoryURLProvider::kScoreForBestInlineableResult - 1;
   }
   bookmark_value_ = OmniboxFieldTrial::HQPBookmarkValue();
   initialized_ = true;
 }
 
 }  // namespace history