Omnibox: Make the Controller Reorder Matches for Inlining

chrome/browser/autocomplete/search_provider.h

 // 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.
 //
 // This file contains the Search autocomplete provider.  This provider is
 // responsible for all autocomplete entries that start with "Search <engine>
 // for ...", including searching for the current input string, search
 // history, and search suggestions.  An instance of it gets created and
 // managed by the autocomplete controller.
 
@@ skipping 361 matching lines @@
   bool ParseSuggestResults(base::Value* root_val, bool is_keyword);
 
   // Converts the parsed results to a set of AutocompleteMatches, |matches_|.
   void ConvertResultsToAutocompleteMatches();
 
   // Checks if suggested relevances violate certain expected constraints.
   // See UpdateMatches() for the use and explanation of these constraints.
   bool IsTopMatchNavigationInKeywordMode() const;
   bool IsTopMatchScoreTooLow() const;
   bool IsTopMatchSearchWithURLInput() const;
-  bool IsTopMatchNotInlinable() const;
+  bool LacksValidDefaultMatch(
+      bool omnibox_will_reorder_for_legal_default_match) const;

[Peter Kasting, 2013/08/06 22:56:16]

Nit: It's slightly confusing to refer to "omnibox" here since this code is
technically part of the omnibox already.

Maybe |allow_default_anywhere_in_list|?  I suppose you could do
|autocomplete_result_can_reorder_default_matches| or something but that seems
kind of verbose.

[Mark P, 2013/08/07 00:44:31]

Changed to autocomplete_result_will_reorder_for_default_match.

 
   // Updates |matches_| from the latest results; applies calculated relevances
   // if suggested relevances cause undesriable behavior. Updates |done_|.
   void UpdateMatches();
 
   // Converts an appropriate number of navigation results in
   // |navigation_results| to matches and adds them to |matches|.
   void AddNavigationResultsToMatches(
       const NavigationResults& navigation_results,
       ACMatches* matches);
@@ skipping 138 matching lines @@
   int omnibox_start_margin_;
 
   // If true, search history query suggestions will score low enough that
   // they will not be inlined.
   bool prevent_search_history_inlining_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_