Omnibox: Make Keyword Provide More Generous with Matching

chrome/browser/autocomplete/keyword_extensions_delegate_impl.cc

 // Copyright 2014 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/keyword_extensions_delegate_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 161 matching lines @@
       for (size_t i = 0; i < suggestions.suggest_results.size(); ++i) {
         const omnibox_api::SuggestResult& suggestion =
             *suggestions.suggest_results[i];
         // We want to order these suggestions in descending order, so start with
         // the relevance of the first result (added synchronously in Start()),
         // and subtract 1 for each subsequent suggestion from the extension.
         // We recompute the first match's relevance; we know that |complete|
         // is true, because we wouldn't get results from the extension unless
         // the full keyword had been typed.
         int first_relevance = KeywordProvider::CalculateRelevance(
-            input.type(), true, true, input.prefer_keyword(),
+            input.type(), true, true, true, input.prefer_keyword(),
             input.allow_exact_keyword_match());
         // Because these matches are async, we should never let them become the
         // default match, lest we introduce race conditions in the omnibox user
         // interaction.
         extension_suggest_matches_.push_back(
             provider_->CreateAutocompleteMatch(
-                template_url, input, keyword.length(),
+                template_url, keyword.length(), input, keyword.length(),
                 base::UTF8ToUTF16(suggestion.content), false,
                 first_relevance - (i + 1)));
 
         AutocompleteMatch* match = &extension_suggest_matches_.back();
         match->contents.assign(base::UTF8ToUTF16(suggestion.description));
         match->contents_class =
             extensions::StyleTypesToACMatchClassifications(suggestion);
       }
 
       set_done(true);
       matches()->insert(matches()->end(),
                         extension_suggest_matches_.begin(),
                         extension_suggest_matches_.end());
       OnProviderUpdate(!extension_suggest_matches_.empty());
       return;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 void KeywordExtensionsDelegateImpl::OnProviderUpdate(bool updated_matches) {
   provider_->listener_->OnProviderUpdate(updated_matches);
 }