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 39 matching lines @@
 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)),
-      reorder_for_inlining_(false) {
+      local_reorder_for_inlining_(false),
+      omnibox_will_reorder_for_inlining_(
+          OmniboxFieldTrial::InReorderForInliningGroup()) {
   enum InliningOption {
     INLINING_PROHIBITED = 0,
     INLINING_ALLOWED = 1,
     INLINING_AUTO_BUT_NOT_IN_FIELD_TRIAL = 2,
     INLINING_FIELD_TRIAL_DEFAULT_GROUP = 3,
     INLINING_FIELD_TRIAL_EXPERIMENT_GROUP = 4,
     NUM_OPTIONS = 5
   };
   // should always be overwritten
   InliningOption inlining_option = NUM_OPTIONS;
@@ skipping 36 matching lines @@
     }
   }
 
   // Add a beacon to the logs that'll allow us to identify later what
   // inlining state a user is in.  Do this by incrementing a bucket in
   // a histogram, where the bucket represents the user's inlining state.
   UMA_HISTOGRAM_ENUMERATION(
       "Omnibox.InlineHistoryQuickProviderFieldTrialBeacon",
       inlining_option, NUM_OPTIONS);
 
-  reorder_for_inlining_ = CommandLine::ForCurrentProcess()->
+  local_reorder_for_inlining_ = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::
                           kOmniboxHistoryQuickProviderReorderForInlining) ==
       switches::kOmniboxHistoryQuickProviderReorderForInliningEnabled;
 }
 
 void HistoryQuickProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes) {
   matches_.clear();
   if (disabled_)
     return;
@@ skipping 47 matching lines @@
 
   // If we're allowed to reorder results in order to get an inlineable
   // result to appear first (and hence have a HistoryQuickProvider
   // suggestion possibly appear first), find the first inlineable
   // result and then swap it to the front.  Obviously, don't do this
   // if we're told to prevent inline autocompletion.  (If we're told
   // we're going to prevent inline autocompletion, we're going to
   // later demote the score of all results so none will be inlined.
   // Hence there's no need to reorder the results so an inlineable one
   // appears first.)
-  if (reorder_for_inlining_ &&
+  if (local_reorder_for_inlining_ &&
       !PreventInlineAutocomplete(autocomplete_input_)) {
     for (ScoredHistoryMatches::iterator i(matches.begin());
          (i != matches.end()) &&
              (i->raw_score >= AutocompleteResult::kLowestDefaultScore);
          ++i) {
       if (i->can_inline) {  // this test is only true once because of the break
         if (i != matches.begin())
           std::rotate(matches.begin(), i, i + 1);
         break;
       }
@@ skipping 102 matching lines @@
   // 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) ?
+      (!matches.begin()->can_inline && !omnibox_will_reorder_for_inlining_)) ?
       (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 98 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;
 }