Omnibox - Keyword Provider Shouldn't Bold What-You-Typed Queries

components/omnibox/browser/keyword_provider.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 "components/omnibox/browser/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 431 matching lines @@
   return match;
 }
 
 void KeywordProvider::FillInURLAndContents(
     const base::string16& remaining_input,
     const TemplateURL* element,
     AutocompleteMatch* match) const {
   DCHECK(!element->short_name().empty());
   const TemplateURLRef& element_ref = element->url_ref();
   DCHECK(element_ref.IsValid(GetTemplateURLService()->search_terms_data()));
-  int message_id = (element->GetType() == TemplateURL::OMNIBOX_API_EXTENSION) ?
-      IDS_EXTENSION_KEYWORD_COMMAND : IDS_KEYWORD_SEARCH;
   if (remaining_input.empty()) {
     // Allow extension keyword providers to accept empty string input. This is
     // useful to allow extensions to do something in the case where no input is
     // entered.
     if (element_ref.SupportsReplacement(
             GetTemplateURLService()->search_terms_data()) &&
         (element->GetType() != TemplateURL::OMNIBOX_API_EXTENSION)) {
       // No query input; return a generic, no-destination placeholder.
       match->contents.assign(
-          l10n_util::GetStringFUTF16(message_id,
+          l10n_util::GetStringFUTF16(
+              IDS_KEYWORD_SEARCH,
               element->AdjustedShortNameForLocaleDirection(),
               l10n_util::GetStringUTF16(IDS_EMPTY_KEYWORD_VALUE)));

[Peter Kasting, 2016/03/17 06:08:11]

Should we change this to just "<enter query> - Amazon search", which would be
parallel to both the "?" placeholder text and the with-query-string text?

If so, we can nuke IDS_KEYWORD_SEARCH entirely,

We can also remove the commentary about "Search ... for" that you added to the
tests, since that string won't appear anywhere in the codebase and thus readers
would have no reason to expect us to use it that we'd need to comment about.

[Mark P, 2016/04/01 21:48:39]

Changed text per the bug. 
And then nuked IDS_KEYWORD_SEARCH, yay.
Revised code and comments in unit test.

       match->contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::DIM));
     } else {
-      // Keyword that has no replacement text (aka a shorthand for a URL).
+      // Keyword or extension that has no replacement text (aka a shorthand for
+      // a URL).
       match->destination_url = GURL(element->url());
       match->contents.assign(element->short_name());
       AutocompleteMatch::ClassifyLocationInString(0, match->contents.length(),
           match->contents.length(), ACMatchClassification::NONE,
           &match->contents_class);
     }
   } else {
     // Create destination URL by escaping user input and substituting into
     // keyword template URL.  The escaping here handles whitespace in user
     // input, but we rely on later canonicalization functions to do more
     // fixup to make the URL valid if necessary.
     DCHECK(element_ref.SupportsReplacement(
         GetTemplateURLService()->search_terms_data()));
     TemplateURLRef::SearchTermsArgs search_terms_args(remaining_input);
     search_terms_args.append_extra_query_params =
         element == GetTemplateURLService()->GetDefaultSearchProvider();
     match->destination_url = GURL(element_ref.ReplaceSearchTerms(
         search_terms_args, GetTemplateURLService()->search_terms_data()));
-    std::vector<size_t> content_param_offsets;
-    match->contents.assign(l10n_util::GetStringFUTF16(message_id,
-                                                      element->short_name(),
-                                                      remaining_input,
-                                                      &content_param_offsets));
-    DCHECK_EQ(2U, content_param_offsets.size());
-    AutocompleteMatch::ClassifyLocationInString(content_param_offsets[1],
-        remaining_input.length(), match->contents.length(),
-        ACMatchClassification::NONE, &match->contents_class);
+    match->contents = remaining_input;
+    match->contents_class.push_back(
+        ACMatchClassification(0, ACMatchClassification::NONE));
   }
 }
 
 TemplateURLService* KeywordProvider::GetTemplateURLService() const {
   // Make sure the model is loaded. This is cheap and quickly bails out if
   // the model is already loaded.
   model_->Load();
   return model_;
 }