Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/history_url_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_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 331 matching lines @@
     // NOTE: We use TrimHttpPrefix() here rather than StringForURLDisplay() to
     // strip the scheme as we need to know the offset so we can adjust the
     // |match_location| below.  StringForURLDisplay() and TrimHttpPrefix() have
     // slightly different behavior as well (the latter will strip even without
     // two slashes after the scheme).
     string16 display_string(provider->StringForURLDisplay(url, false, false));
     const size_t offset = trim_http ? TrimHttpPrefix(&display_string) : 0;
     match.fill_into_edit =
         AutocompleteInput::FormattedStringWithEquivalentMeaning(url,
                                                                 display_string);
+    match.allowed_to_be_default_match = true;

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

How does this relate to the seemingly contradictory comment below?

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

We do want the match to be default, we just don't want random trailing slashes
to appear as the user is finishing typing URLs.

[msw, 2013/07/18 17:46:53]

Ah, thanks for clarifying.

     // NOTE: Don't set match.inline_autocomplete_offset (to allow inline
     // autocompletion) here, it's surprising and annoying.
 
     // Try to highlight "innermost" match location.  If we fix up "w" into
     // "www.w.com", we want to highlight the fifth character, not the first.
     // This relies on match.destination_url being the non-prefix-trimmed version
     // of match.contents.
     match.contents = display_string;
     const URLPrefix* best_prefix = URLPrefix::BestURLPrefix(
         UTF8ToUTF16(match.destination_url.spec()), input.text());
@@ skipping 690 matching lines @@
   std::string languages = (match_type == WHAT_YOU_TYPED) ?
       std::string() : params->languages;
   const net::FormatUrlTypes format_types = net::kFormatUrlOmitAll &
       ~((params->trim_http && !history_match.match_in_scheme) ?
           0 : net::kFormatUrlOmitHTTP);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(info.url(),
           net::FormatUrl(info.url(), languages, format_types,
                          net::UnescapeRule::SPACES, NULL, NULL,
                          &inline_autocomplete_offset));
-  if (!params->prevent_inline_autocomplete)
+  if (!params->prevent_inline_autocomplete) {
+    match.allowed_to_be_default_match = true;

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

Should this only be true is inline_autocomplete_offset != string16::npos?

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

I don't think so but I'm not actually sure.

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

I think the current code is right:

HistoryURL provider always makes prefix matches only.  Isn't everything it
returns (both URLs with completions and what-you-typed results, the latter of
which can have inline_autocomplete_offset == string16::npos), allowed to be the
default match? (unless we're preventing inline autocompletion)  That's why I
think we should basically always set allowed_to_be_default_match to true.

[msw, 2013/07/23 21:55:32]

It looks like you took my suggestion in r212693 anyway...

[Mark P, 2013/07/26 16:48:13]

Thought more; revised this code.

     match.inline_autocomplete_offset = inline_autocomplete_offset;
+  }
   DCHECK((match.inline_autocomplete_offset == string16::npos) ||
          (match.inline_autocomplete_offset <= match.fill_into_edit.length()));
 
   size_t match_start = history_match.input_location;
   match.contents = net::FormatUrl(info.url(), languages,
       format_types, net::UnescapeRule::SPACES, NULL, NULL, &match_start);
   if ((match_start != string16::npos) &&
       (inline_autocomplete_offset != string16::npos) &&
       (inline_autocomplete_offset != match_start)) {
     DCHECK(inline_autocomplete_offset > match_start);
     AutocompleteMatch::ClassifyLocationInString(match_start,
         inline_autocomplete_offset - match_start, match.contents.length(),
         ACMatchClassification::URL, &match.contents_class);
   } else {
     AutocompleteMatch::ClassifyLocationInString(string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }