Modify Entity Suggestion support and Add Profile Suggest support

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 66 matching lines @@
   // |append_extra_query_params| should be set if |template_url| is the default
   // search engine, so the destination URL will contain any
   // command-line-specified query params.
   static AutocompleteMatch CreateSearchSuggestion(
       AutocompleteProvider* autocomplete_provider,
       const AutocompleteInput& input,
       const string16& input_text,
       int relevance,
       AutocompleteMatch::Type type,
       bool is_keyword,
-      const string16& match_contents,
+      const string16& title,
+      const ACMatchClassifications& title_class,
       const string16& annotation,
+      const ACMatchClassifications& annotation_class,
       const TemplateURL* template_url,
       const string16& query_string,
       const std::string& suggest_query_params,
       int accepted_suggestion,
       int omnibox_start_margin,
       bool append_extra_query_params);
 
   // Returns whether the SearchProvider previously flagged |match| as a query
   // that should be prefetched.
   static bool ShouldPrefetch(const AutocompleteMatch& match);
@@ skipping 118 matching lines @@
     // based on server information, and thus is assumed to be more accurate.
     // This is ultimately used in
     // SearchProvider::ConvertResultsToAutocompleteMatches(), see comments
     // there.
     bool relevance_from_server_;
   };
 
   class SuggestResult : public Result {
    public:
     SuggestResult(const string16& suggestion,
-                  const string16& match_contents,
+                  AutocompleteMatchType::Type type,
+                  const string16& title,
+                  ACMatchClassifications title_class,
                   const string16& annotation,
+                  ACMatchClassifications annotation_class,
                   const std::string& suggest_query_params,
                   bool from_keyword_provider,
                   int relevance,
                   bool relevance_from_server,
                   bool should_prefetch);
     virtual ~SuggestResult();
 
     const string16& suggestion() const { return suggestion_; }
-    const string16& match_contents() const { return match_contents_; }
+    AutocompleteMatchType::Type type() const { return type_; }
+    const string16& title() const { return title_; }
+    const ACMatchClassifications& title_class() const { return title_class_; }
     const string16& annotation() const { return annotation_; }
+    const ACMatchClassifications& annotation_class() const {
+      return annotation_class_;
+    }
     const std::string& suggest_query_params() const {
       return suggest_query_params_;
     }
     bool should_prefetch() const { return should_prefetch_; }
 
     // Result:
     virtual bool IsInlineable(const string16& input) const OVERRIDE;
     virtual int CalculateRelevance(
         const AutocompleteInput& input,
         bool keyword_provider_requested) const OVERRIDE;
 
    private:
     // The search terms to be used for this suggestion.
     string16 suggestion_;
 
+    AutocompleteMatchType::Type type_;
+
     // The contents to be displayed in the autocomplete match.
-    string16 match_contents_;
+    string16 title_;
+    ACMatchClassifications title_class_;
 
-    // Optional annotation for the |match_contents_| for disambiguation.
+    // Optional annotation for the |title_| for disambiguation.
     // This may be displayed in the autocomplete match contents, but is defined
     // separately to facilitate different formatting.
     string16 annotation_;
+    ACMatchClassifications annotation_class_;
 
     // Optional additional parameters to be added to the search URL.
     std::string suggest_query_params_;
 
     // Should this result be prefetched?
     bool should_prefetch_;
   };
 
   class NavigationResult : public Result {
    public:
@@ skipping 217 matching lines @@
   // Creates an AutocompleteMatch for "Search <engine> for |query_string|" with
   // the supplied relevance.  Adds this match to |map|; if such a match already
   // exists, whichever one has lower relevance is eliminated.
   void AddMatchToMap(const string16& input_text,
                      int relevance,
                      bool relevance_from_server,
                      bool should_prefetch,
                      const std::string& metadata,
                      AutocompleteMatch::Type type,
                      bool is_keyword,
-                     const string16& match_contents,
+                     const string16& title,
+                     const ACMatchClassifications& title_class,
                      const string16& annotation,
+                     const ACMatchClassifications& annotation_class,
                      const string16& query_string,
                      int accepted_suggestion,
                      const std::string& suggest_query_params,
                      MatchMap* map);
 
   // Returns an AutocompleteMatch for a navigational suggestion.
   AutocompleteMatch NavigationToMatch(const NavigationResult& navigation);
 
   // Resets the scores of all |keyword_navigation_results_| matches to
   // be below that of the top keyword query match (the verbatim match
@@ skipping 74 matching lines @@
   bool field_trial_triggered_in_session_;
 
   // 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_