Omnibox: Create Keyword Verbatim Result in Search Provider

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 non-keyword 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
+// 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 267 matching lines @@
   // results correspond to the keyword provider or default provider.
   void AddSuggestResultsToMap(const SuggestResults& results,
                               bool is_keyword,
                               MatchMap* map);
 
   // Get the relevance score for the verbatim result; this value may be provided
   // by the suggest server; otherwise it is calculated locally.
   int GetVerbatimRelevance() const;
   // Calculate the relevance score for the verbatim result.
   int CalculateRelevanceForVerbatim() const;
+  // Calculate the relevance score for the keyword verbatim result (used if

[Bart N., 2013/01/29 18:50:42]

Nit: We usually refer in 3rd-person when describing top level comment (i.e.
"Calculates" vs "Calculate"). I know some of the comments are inconsistent, but
most of them use the right form.

[Mark P, 2013/01/30 19:46:21]

Cleaned up some nearby comments.

+  // we have a keyword provider).
+  static int CalculateRelevanceForKeywordVerbatim(AutocompleteInput::Type type,

[Bart N., 2013/01/29 18:50:42]

Note: As you've seen in my pending CL (12039053), this will most likely gets
simplified by replacing type/prefer_keyword with AutocompleteInput&
keyword_input.

[Mark P, 2013/01/30 19:46:21]

Ack.

+                                                  bool prefer_keyword);
   // |time| is the time at which this query was last seen.  |is_keyword|
   // indicates whether the results correspond to the keyword provider or default
   // provider. |prevent_inline_autocomplete| is true if we should not inline
   // autocomplete this query.
   int CalculateRelevanceForHistory(const base::Time& time,
                                    bool is_keyword,
                                    bool prevent_inline_autocomplete) const;
   // Calculate the relevance for search suggestion results. Set |for_keyword| to
   // true for relevance values applicable to keyword provider results.
   int CalculateRelevanceForSuggestion(bool for_keyword) const;
@@ skipping 80 matching lines @@
   bool field_trial_triggered_;
 
   // Same as above except that it is maintained across the current Omnibox
   // session.
   bool field_trial_triggered_in_session_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_