Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/autocomplete_match.cc

Index: chrome/browser/autocomplete/autocomplete_match.cc
diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc
index fc6774c5d8e10bde74f42f9c611be8d725bb0644..a39ba6202250e19bad8e9c65dbad5110f376d376 100644
--- a/chrome/browser/autocomplete/autocomplete_match.cc
+++ b/chrome/browser/autocomplete/autocomplete_match.cc
@@ -44,6 +44,7 @@ AutocompleteMatch::AutocompleteMatch()
       typed_count(-1),
       deletable(false),
       inline_autocomplete_offset(string16::npos),
+      allowed_to_be_default_match(false),
       transition(content::PAGE_TRANSITION_GENERATED),
       is_history_what_you_typed_match(false),
       type(AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED),
@@ -60,6 +61,7 @@ AutocompleteMatch::AutocompleteMatch(AutocompleteProvider* provider,
       typed_count(-1),
       deletable(deletable),
       inline_autocomplete_offset(string16::npos),
+      allowed_to_be_default_match(false),
       transition(content::PAGE_TRANSITION_TYPED),
       is_history_what_you_typed_match(false),
       type(type),
@@ -74,6 +76,7 @@ AutocompleteMatch::AutocompleteMatch(const AutocompleteMatch& match)
       deletable(match.deletable),
       fill_into_edit(match.fill_into_edit),
       inline_autocomplete_offset(match.inline_autocomplete_offset),
+      allowed_to_be_default_match(match.allowed_to_be_default_match),
       destination_url(match.destination_url),
       stripped_destination_url(match.stripped_destination_url),
       contents(match.contents),
@@ -108,6 +111,7 @@ AutocompleteMatch& AutocompleteMatch::operator=(
   deletable = match.deletable;
   fill_into_edit = match.fill_into_edit;
   inline_autocomplete_offset = match.inline_autocomplete_offset;
+  allowed_to_be_default_match = match.allowed_to_be_default_match;

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

Does any code modify a copied match in some way that should alter this value?

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

If there is some, I don't know what we should do other than have that code
modify this value directly.  The only change we could make here -- namely, not
copying over this value automatically -- is definitely wrong and will break lots
of code, e.g. everything that puts matches in a vector.

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

Yes, I would suggest modifying the code that does the copying, if needed. I
don't think this code should be changed, but I think we should audit places that
copy (and modify) matches to ensure they're not doing something wrong with this
new behavior.

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

When constructing this changelist, I examined every instance of
inline_autocomplete_offset.  This normally controls whether a match should be
allowed to be default; if this value changes, that means a whether it can be
default usually changes.  I didn't see any instances where it looks like
revising the value after the AutocompleteMatch was creates it is the right thing
to do.  I also examined every place where an AutocompleteMatch is created.

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

Thanks for doing that audit.

   destination_url = match.destination_url;
   stripped_destination_url = match.stripped_destination_url;
   contents = match.contents;