Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/history_quick_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/history_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 38 matching lines @@
 using history::ScoredHistoryMatch;
 using history::ScoredHistoryMatches;
 
 bool HistoryQuickProvider::disabled_ = false;
 
 HistoryQuickProvider::HistoryQuickProvider(
     AutocompleteProviderListener* listener,
     Profile* profile)
     : HistoryProvider(listener, profile,
           AutocompleteProvider::TYPE_HISTORY_QUICK),
-      languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)) {
+      languages_(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),
+      omnibox_will_reorder_for_legal_default_match_(
+          OmniboxFieldTrial::InReorderForLegalDefaultMatchGroup()) {
 }
 
 void HistoryQuickProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes) {
   matches_.clear();
   if (disabled_)
     return;
 
   // Don't bother with INVALID and FORCED_QUERY.  Also pass when looking for
   // BEST_MATCH and there is no inline autocompletion because none of the HQP
@@ skipping 131 matching lines @@
     }
   }
 
   // Loop over every result and add it to matches_.  In the process,
   // guarantee that scores are decreasing.  |max_match_score| keeps
   // track of the highest score we can assign to any later results we
   // see.  Also, if we're not allowing inline autocompletions in
   // general or the current best suggestion isn't inlineable,
   // artificially reduce the starting |max_match_score| (which
   // therefore applies to all results) to something low enough that
-  // guarantees no result will be offered as an autocomplete
+  // guarantees no result will be offered as an inline autocomplete
   // suggestion.  Also do a similar reduction if we think there will be
   // a URL-what-you-typed match.  (We want URL-what-you-typed matches for
   // visited URLs to beat out any longer URLs, no matter how frequently
   // they're visited.)  The strength of this last reduction depends on the
   // likely score for the URL-what-you-typed result.
 
   // |template_url_service| or |template_url| can be NULL in unit tests.
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   TemplateURL* template_url = template_url_service ?
       template_url_service->GetDefaultSearchProvider() : NULL;
-  int max_match_score = (PreventInlineAutocomplete(autocomplete_input_) ||
-      !matches.begin()->can_inline) ?
+  int max_match_score = (!omnibox_will_reorder_for_legal_default_match_ &&
+      (!PreventInlineAutocomplete(autocomplete_input_) ||

[msw, 2013/07/18 06:23:57]

Did you mean to negate this boolean? It looks unintentional.

[Peter Kasting, 2013/07/18 17:35:28]

Hmm, good catch, I agree.  I looked at this code when I reviewed but I think I
made a mistake in reading it.

[Mark P, 2013/07/21 20:31:05]

Yes, good catch.  That was a bug.  Fixed.

+       !matches.begin()->can_inline)) ?
       (AutocompleteResult::kLowestDefaultScore - 1) :
       matches.begin()->raw_score;
   if (will_have_url_what_you_typed_match_first) {
     max_match_score = std::min(max_match_score,
         url_what_you_typed_match_score - 1);
   }
   for (ScoredHistoryMatches::const_iterator match_iter = matches.begin();
        match_iter != matches.end(); ++match_iter) {
     const ScoredHistoryMatch& history_match(*match_iter);
     // Culls results corresponding to queries from the default search engine.
@@ skipping 30 matching lines @@
       AutocompleteInput::FormattedStringWithEquivalentMeaning(info.url(),
           net::FormatUrlWithOffsets(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, &offsets));
   history::TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
   match.contents = net::FormatUrl(info.url(), languages_, format_types,
               net::UnescapeRule::SPACES, NULL, NULL, NULL);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
-  if (!history_match.can_inline) {
+  if (!history_match.can_inline ||
+      PreventInlineAutocomplete(autocomplete_input_)) {
     match.inline_autocomplete_offset = string16::npos;
   } else {
     DCHECK(!new_matches.empty());
     match.inline_autocomplete_offset = new_matches[0].offset +
         new_matches[0].length;
+    match.allowed_to_be_default_match = true;
     // The following will happen if the user has typed an URL with a scheme
     // and the last character typed is a slash because that slash is removed
     // by the FormatURLWithOffsets call above.
     if (match.inline_autocomplete_offset > match.fill_into_edit.length())
       match.inline_autocomplete_offset = match.fill_into_edit.length();
   }
 
   // Format the description autocomplete presentation.
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
@@ skipping 42 matching lines @@
     do {
       offset += matches[i].length;
       ++i;
     } while ((i < match_count) && (offset == matches[i].offset));
     if (offset < text_length)
       spans.push_back(ACMatchClassification(offset, url_style));
   }
 
   return spans;
 }