Modify Entity Suggestion support and Add Profile Suggest support

chrome/browser/autocomplete/autocomplete_controller.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/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
   // This type indicates a native chrome suggestion.
   *type = 69;
   // Default value, indicating no subtype.
   *subtype = base::string16::npos;
 
   switch (match) {
     case AutocompleteMatchType::SEARCH_SUGGEST: {
       *type = 0;
       return;
     }
+    case AutocompleteMatchType::SEARCH_SUGGEST_ENTITY: {
+      *subtype = 46;
+      return;
+    }
+    case AutocompleteMatchType::SEARCH_SUGGEST_INFINITE: {
+      *subtype = 33;
+      return;
+    }
+    case AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED: {
+      *subtype = 35;
+      return;
+    }
+    case AutocompleteMatchType::SEARCH_SUGGEST_PROFILE: {
+      *subtype = 44;
+      return;
+    }
     case AutocompleteMatchType::NAVSUGGEST: {
       *type = 5;
       return;
     }
     case AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED: {
       *subtype = 57;
       return;
     }
     case AutocompleteMatchType::URL_WHAT_YOU_TYPED: {
       *subtype = 58;
@@ skipping 50 matching lines @@
 
 // Returns whether the autocompletion is trivial enough that we consider it
 // an autocompletion for which the omnibox autocompletion code did not add
 // any value.
 bool IsTrivialAutocompletion(const AutocompleteMatch& match) {
   return match.type == AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED ||
       match.type == AutocompleteMatchType::URL_WHAT_YOU_TYPED ||
       match.type == AutocompleteMatchType::SEARCH_OTHER_ENGINE;
 }
 
+// Whether this autocomplete match type supports custom descriptions.
+bool AutocompleteMatchHasCustomDescription(const AutocompleteMatch& match) {
+  return match.type == AutocompleteMatchType::SEARCH_SUGGEST_ENTITY ||
+      match.type == AutocompleteMatchType::SEARCH_SUGGEST_PROFILE;
+}
+
 }  // namespace
 
 const int AutocompleteController::kNoItemSelected = -1;
 
 AutocompleteController::AutocompleteController(
     Profile* profile,
     AutocompleteControllerDelegate* delegate,
     int provider_types)
     : delegate_(delegate),
       history_url_provider_(NULL),
@@ skipping 370 matching lines @@
 
 void AutocompleteController::UpdateKeywordDescriptions(
     AutocompleteResult* result) {
   base::string16 last_keyword;
   for (AutocompleteResult::iterator i(result->begin()); i != result->end();
        ++i) {
     if ((i->provider->type() == AutocompleteProvider::TYPE_KEYWORD &&
          !i->keyword.empty()) ||
         (i->provider->type() == AutocompleteProvider::TYPE_SEARCH &&
          AutocompleteMatch::IsSearchType(i->type))) {
+      if (AutocompleteMatchHasCustomDescription(*i))
+        continue;
       i->description.clear();
       i->description_class.clear();
       DCHECK(!i->keyword.empty());
       if (i->keyword != last_keyword) {
         const TemplateURL* template_url = i->GetTemplateURL(profile_, false);
         if (template_url) {
           // For extension keywords, just make the description the extension
           // name -- don't assume that the normal search keyword description is
           // applicable.
           i->description = template_url->AdjustedShortNameForLocaleDirection();
@@ skipping 103 matching lines @@
   // the disruptive effect of belated omnibox updates, updates that
   // come after the user has had to time to read the whole dropdown
   // and doesn't expect it to change.
   const int kStopTimeMS = 1500;
   stop_timer_.Start(FROM_HERE,
                     base::TimeDelta::FromMilliseconds(kStopTimeMS),
                     base::Bind(&AutocompleteController::Stop,
                                base::Unretained(this),
                                false));
 }