Remove "Search" suffix from omnibox search engine match

chrome/browser/autocomplete/autocomplete_controller.cc

Index: chrome/browser/autocomplete/autocomplete_controller.cc
diff --git a/chrome/browser/autocomplete/autocomplete_controller.cc b/chrome/browser/autocomplete/autocomplete_controller.cc
index 061542eb2157e0e4c66347a8cd150c07dd7c5ff9..89a4d5a55fa99a24ed4c6d42474424f841340bc1 100644
--- a/chrome/browser/autocomplete/autocomplete_controller.cc
+++ b/chrome/browser/autocomplete/autocomplete_controller.cc
@@ -561,9 +561,15 @@ void AutocompleteController::UpdateKeywordDescriptions(
       if (i->keyword != last_keyword) {
         const TemplateURL* template_url = i->GetTemplateURL(profile_, false);
         if (template_url) {
-          i->description = l10n_util::GetStringFUTF16(
-              IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
-              template_url->AdjustedShortNameForLocaleDirection());
+          // Don't add the "Search" suffix for extension keywords.

[Peter Kasting, 2013/05/29 21:07:20]

Nit: Shorter but with a more descriptive comment:

          // 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();
          if (!template_url->IsExtensionKeyword()) {
             i->description = l10n_util::GetStringFUTF16(
                 IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION, i->description);
          }

[Aaron Jacobs, 2013/05/29 21:27:21]

Done.

+          if (template_url->IsExtensionKeyword()) {
+            i->description =
+                template_url->AdjustedShortNameForLocaleDirection();
+          } else {
+            i->description = l10n_util::GetStringFUTF16(
+                IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
+                template_url->AdjustedShortNameForLocaleDirection());
+          }
           i->description_class.push_back(
               ACMatchClassification(0, ACMatchClassification::DIM));
         }