Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/history_url_provider.cc

Index: chrome/browser/autocomplete/history_url_provider.cc
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index e831193fd3c86d59f6fa9bdc39aec0ba193f6e0d..7ba3150800e72c046152ce9caf551606fb30fef2 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -349,6 +349,7 @@ AutocompleteMatch HistoryURLProvider::SuggestExactInput(
     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.
 
@@ -1059,8 +1060,10 @@ AutocompleteMatch HistoryURLProvider::HistoryMatchToACMatch(
           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()));