Omnibox - Use Case Insensitive Matching when Bolding Query Suggestions

components/omnibox/search_suggestion_parser.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/search_suggestion_parser.h"
 
+#include <algorithm>
+
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/omnibox/autocomplete_input.h"
@@ skipping 128 matching lines @@
     const size_t contents_index =
         suggestion_.length() - match_contents_.length();
     // Ensure the query starts with the input text, and ends with the match
     // contents, and the input text has an overlap with contents.
     if (StartsWith(suggestion_, input_text, true) &&
         EndsWith(suggestion_, match_contents_, true) &&
         (input_text.length() > contents_index)) {
       lookup_text = input_text.substr(contents_index);
     }
   }
-  size_t lookup_position = match_contents_.find(lookup_text);
-  if (!allow_bolding_all && (lookup_position == base::string16::npos)) {
+  // Do a case-insensitive search for |lookup_text|.
+  base::string16::const_iterator lookup_position = std::search(
+      match_contents_.begin(), match_contents_.end(), lookup_text.begin(),
+      lookup_text.end(), base::CaseInsensitiveCompare<wchar_t>());

[Peter Kasting, 2015/05/11 23:40:37]

wchar_t seems wrong, shouldn't it be char16?

[Mark P, 2015/05/11 23:45:56]

Already fixed; the new patchset was being uploaded as you did your review. :-)

+  if (!allow_bolding_all && (lookup_position == match_contents_.end())) {
     // Bail if the code below to update the bolding would bold the whole
     // string.  Note that the string may already be entirely bolded; if
     // so, leave it as is.
     return;
   }
   match_contents_class_.clear();
   // We do intra-string highlighting for suggestions - the suggested segment
   // will be highlighted, e.g. for input_text = "you" the suggestion may be
   // "youtube", so we'll bold the "tube" section: you*tube*.
   if (input_text != match_contents_) {
-    if (lookup_position == base::string16::npos) {
+    if (lookup_position == match_contents_.end()) {
       // The input text is not a substring of the query string, e.g. input
       // text is "slasdot" and the query string is "slashdot", so we bold the
       // whole thing.
       match_contents_class_.push_back(
           ACMatchClassification(0, ACMatchClassification::MATCH));
     } else {
       // We don't iterate over the string here annotating all matches because
       // it looks odd to have every occurrence of a substring that may be as
       // short as a single character highlighted in a query suggestion result,
       // e.g. for input text "s" and query string "southwest airlines", it
       // looks odd if both the first and last s are highlighted.
-      if (lookup_position != 0) {
+      const size_t lookup_index = lookup_position - match_contents_.begin();
+      if (lookup_index != 0) {
         match_contents_class_.push_back(
             ACMatchClassification(0, ACMatchClassification::MATCH));
       }
       match_contents_class_.push_back(
-          ACMatchClassification(lookup_position, ACMatchClassification::NONE));
-      size_t next_fragment_position = lookup_position + lookup_text.length();
+          ACMatchClassification(lookup_index, ACMatchClassification::NONE));
+      size_t next_fragment_position = lookup_index + lookup_text.length();
       if (next_fragment_position < match_contents_.length()) {
         match_contents_class_.push_back(ACMatchClassification(
             next_fragment_position, ACMatchClassification::MATCH));
       }
     }
   } else {
     // Otherwise, match_contents_ is a verbatim (what-you-typed) match, either
     // for the default provider or a keyword search provider.
     match_contents_class_.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
@@ skipping 332 matching lines @@
           base::CollapseWhitespace(suggestion, false), match_type,
           base::CollapseWhitespace(match_contents, false),
           match_contents_prefix, annotation, answer_contents, answer_type_str,
           answer.Pass(), suggest_query_params, deletion_url, is_keyword_result,
           relevance, relevances != NULL, should_prefetch, trimmed_input));
     }
   }
   results->relevances_from_server = relevances != NULL;
   return true;
 }